diff --git a/build.gradle b/build.gradle index 6e7ae3209..e1e6334f5 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,7 @@ plugins { id 'application' } +// Java settings java { // Must be disabled in order to use the gradle-modules-plugin modularity.inferModulePath = false @@ -17,17 +18,13 @@ application { } // Fetch the build version from the build.properties file -Properties props = new Properties() -try { - props.load(file('./core/src/main/resources/build.properties').newDataInputStream()) -} catch (Exception ex) { - throw new Exception("Missing build.properties. file: " + ex.getMessage()) -} +def buildProperties = new Properties() +file('core/src/main/resources/build.properties').withInputStream { buildProperties.load(it) } +group = 'info.openrocket' +version = buildProperties['build.version'] +// Common project configuration allprojects { - group 'info.openrocket' - version = props['build.version'] - repositories { mavenCentral() maven { url "https://jitpack.io" } @@ -42,9 +39,6 @@ subprojects { // Configure the gradle-modules-plugin modularity { standardJavaRelease(17) // For targeting Java 17 - /*modularity.patchModule("hamcrest", "hamcrest-2.2.jar") - modularity.patchModule("hamcrest.core", "hamcrest-core-2.2.jar") - modularity.patchModule("hamcrest.library", "hamcrest-library-2.2.jar")*/ modularity.patchModule("java.scripting", "script-api-1.0.jar") } @@ -53,15 +47,16 @@ subprojects { testLogging { events 'PASSED', 'FAILED', 'SKIPPED', 'STANDARD_OUT' + exceptionFormat = 'full' + showStackTraces = true stackTraceFilters = [] } } // Common dependencies dependencies { - testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.2' - testImplementation group: 'org.hamcrest', name: 'hamcrest-core', version: '2.2' - testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.2' + implementation group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '4.0.2' + testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: '1.10.2' testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.10.2' testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0' @@ -75,6 +70,7 @@ subprojects { // dependsOn ':core:serializeEngines' //} +// JAR config jar { archiveBaseName.set('OpenRocket') @@ -84,7 +80,7 @@ jar { 'SplashScreen-Image': 'pix/splashscreen.png', // Versioning - 'Implementation-Version': props['build.version'], + 'Implementation-Version': buildProperties['build.version'], // Vendor Details 'Implementation-Vendor': 'OpenRocket', @@ -94,6 +90,7 @@ jar { } } +// Project dependencies dependencies { implementation(project(":core")) implementation(project(":swing")) @@ -101,14 +98,13 @@ dependencies { shadowJar { archiveBaseName.set('OpenRocket') + archiveVersion.set(buildProperties['build.version']) archiveClassifier.set('') - archiveVersion.set(props['build.version']) } -shadowJar.dependsOn(['jar']) //shadowJar.dependsOn([':core:serializeEngines']) -// Packages the application for distribution. +// Package the application for distribution. tasks.register('dist') { group = 'info.openrocket' dependsOn 'shadowJar' diff --git a/core/build.gradle b/core/build.gradle index 993121055..2e204e0fd 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.github.johnrengelman.shadow" + id 'com.github.johnrengelman.shadow' id 'java' id 'com.adarshr.test-logger' version '3.2.0' id 'checkstyle' @@ -36,29 +36,26 @@ extraJavaModuleInfo { } dependencies { - implementation group: 'org.commonmark', name: 'commonmark', version: '0.19.0' // 0.21.0 + implementation group: 'org.commonmark', name: 'commonmark', version: '0.21.0' implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.12' implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.0' - //implementation group: 'org.slf4j', name: 'logback-classic', version: '2.0.12' - implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.8.1' // 3.12.0 + implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0' implementation group: 'com.google.inject', name: 'guice', version: '7.0.0' implementation group: 'com.opencsv', name: 'opencsv', version: '5.7.1' implementation group: 'org.graalvm.sdk', name: 'graal-sdk', version: '23.0.3' implementation group: 'org.graalvm.js', name: 'js-scriptengine', version: '23.0.3' implementation group: 'org.graalvm.js', name: 'js', version: '23.0.3' implementation group: 'org.graalvm.truffle', name: 'truffle-api', version: '23.0.3' - implementation group: 'com.ibm.icu', name: 'icu4j', version: '71.1' // 72.1 + implementation group: 'com.ibm.icu', name: 'icu4j', version: '71.2' implementation files('libs/script-api-1.0.jar') implementation group: 'io.github.classgraph', name: 'classgraph', version: '4.8.165' implementation 'de.javagl:obj:0.4.0' - runtimeOnly group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '2.3.3' - implementation group: 'javax.activation', name: 'javax.activation-api', version: '1.2.0' implementation group: 'jakarta.activation', name: 'jakarta.activation-api', version: '2.1.2' - implementation group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.3' - implementation 'org.glassfish:javax.json:1.1.3' // 1.1.4 - implementation 'org.eclipse:yasson:1.0.2' // 2.0.1 + implementation group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '4.0.5' + implementation group: 'org.glassfish', name: 'jakarta.json', version: '2.0.1' + implementation group: 'org.eclipse', name: 'yasson', version: '2.0.1' } def serializedEnginesPath = './src/main/resources/datafiles/thrustcurves/thrustcurves.ser' diff --git a/core/src/main/java/info/openrocket/core/communication/ReleaseInfo.java b/core/src/main/java/info/openrocket/core/communication/ReleaseInfo.java index fd444d7f9..41f916be6 100644 --- a/core/src/main/java/info/openrocket/core/communication/ReleaseInfo.java +++ b/core/src/main/java/info/openrocket/core/communication/ReleaseInfo.java @@ -5,8 +5,8 @@ import info.openrocket.core.util.ArrayList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.json.JsonArray; -import javax.json.JsonObject; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; import java.util.List; import java.util.Objects; diff --git a/core/src/main/java/info/openrocket/core/communication/UpdateInfoRetriever.java b/core/src/main/java/info/openrocket/core/communication/UpdateInfoRetriever.java index 03089e248..91875e6fb 100644 --- a/core/src/main/java/info/openrocket/core/communication/UpdateInfoRetriever.java +++ b/core/src/main/java/info/openrocket/core/communication/UpdateInfoRetriever.java @@ -17,12 +17,12 @@ import org.slf4j.LoggerFactory; import info.openrocket.core.startup.Application; import info.openrocket.core.util.BuildProperties; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.stream.JsonParsingException; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; +import jakarta.json.stream.JsonParsingException; /** * Class that initiates fetching software update information. diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/CustomBooleanAdapter.java b/core/src/main/java/info/openrocket/core/file/rasaero/CustomBooleanAdapter.java index 67aa42d05..a4a287130 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/CustomBooleanAdapter.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/CustomBooleanAdapter.java @@ -1,6 +1,6 @@ package info.openrocket.core.file.rasaero; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; public class CustomBooleanAdapter extends XmlAdapter { diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/CustomDoubleAdapter.java b/core/src/main/java/info/openrocket/core/file/rasaero/CustomDoubleAdapter.java index d5ab824d9..fafb67fd7 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/CustomDoubleAdapter.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/CustomDoubleAdapter.java @@ -1,6 +1,6 @@ package info.openrocket.core.file.rasaero; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.util.Locale; diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/BasePartDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/BasePartDTO.java index 4ae52e1e1..b51ef9e4c 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/BasePartDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/BasePartDTO.java @@ -12,13 +12,13 @@ import info.openrocket.core.rocketcomponent.RocketComponent; import info.openrocket.core.rocketcomponent.Transition; import info.openrocket.core.rocketcomponent.position.AxialMethod; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import info.openrocket.core.file.rasaero.export.RASAeroSaver.RASAeroExportException; import info.openrocket.core.startup.Application; diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/BoattailDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/BoattailDTO.java index 8a6efa89e..0490e1063 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/BoattailDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/BoattailDTO.java @@ -6,9 +6,9 @@ import info.openrocket.core.logging.WarningSet; import info.openrocket.core.rocketcomponent.Transition; import info.openrocket.core.file.rasaero.export.RASAeroSaver.RASAeroExportException; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = RASAeroCommonConstants.BOATTAIL) @XmlAccessorType(XmlAccessType.FIELD) diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/BodyTubeDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/BodyTubeDTO.java index 8ba4aabf3..9ad4cd5d8 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/BodyTubeDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/BodyTubeDTO.java @@ -7,14 +7,14 @@ import info.openrocket.core.logging.ErrorSet; import info.openrocket.core.logging.WarningSet; import info.openrocket.core.rocketcomponent.BodyTube; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import info.openrocket.core.file.rasaero.export.RASAeroSaver.RASAeroExportException; import info.openrocket.core.startup.Application; diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/BodyTubeDTOAdapter.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/BodyTubeDTOAdapter.java index b34b535c7..4bf271a2c 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/BodyTubeDTOAdapter.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/BodyTubeDTOAdapter.java @@ -14,7 +14,7 @@ import info.openrocket.core.startup.Application; import info.openrocket.core.util.MathUtil; import info.openrocket.core.file.rasaero.export.RASAeroSaver.RASAeroExportException; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlTransient; public interface BodyTubeDTOAdapter { @XmlTransient diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/BoosterDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/BoosterDTO.java index 5819b80cd..a16ae28cd 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/BoosterDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/BoosterDTO.java @@ -11,13 +11,13 @@ import info.openrocket.core.rocketcomponent.NoseCone; import info.openrocket.core.rocketcomponent.Rocket; import info.openrocket.core.rocketcomponent.RocketComponent; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import info.openrocket.core.file.rasaero.export.RASAeroSaver.RASAeroExportException; import info.openrocket.core.rocketcomponent.SymmetricComponent; diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/FinDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/FinDTO.java index 088269d02..2e9bb0e44 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/FinDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/FinDTO.java @@ -10,12 +10,12 @@ import info.openrocket.core.rocketcomponent.position.AxialMethod; import info.openrocket.core.file.rasaero.export.RASAeroSaver.RASAeroExportException; import info.openrocket.core.startup.Application; -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.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; @XmlRootElement(name = RASAeroCommonConstants.FIN) @XmlAccessorType(XmlAccessType.FIELD) diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/LaunchSiteDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/LaunchSiteDTO.java index e60472299..f45fb830d 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/LaunchSiteDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/LaunchSiteDTO.java @@ -10,11 +10,11 @@ import info.openrocket.core.simulation.SimulationOptions; import info.openrocket.core.startup.Application; import info.openrocket.core.startup.Preferences; -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.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; @XmlRootElement(name = RASAeroCommonConstants.LAUNCH_SITE) @XmlAccessorType(XmlAccessType.FIELD) diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/NoseConeDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/NoseConeDTO.java index 20f258352..194db48d6 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/NoseConeDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/NoseConeDTO.java @@ -6,12 +6,12 @@ import info.openrocket.core.logging.ErrorSet; import info.openrocket.core.logging.WarningSet; import info.openrocket.core.rocketcomponent.NoseCone; -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.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import info.openrocket.core.file.rasaero.export.RASAeroSaver.RASAeroExportException; import info.openrocket.core.file.rasaero.RASAeroCommonConstants.NoseConeShapeSettings; diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/RASAeroDocumentDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/RASAeroDocumentDTO.java index 575eecdc6..740eec970 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/RASAeroDocumentDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/RASAeroDocumentDTO.java @@ -2,10 +2,10 @@ package info.openrocket.core.file.rasaero.export; import info.openrocket.core.file.rasaero.RASAeroCommonConstants; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * The top level RASAero document. diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/RASAeroSaver.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/RASAeroSaver.java index 20ae5b71f..f8755f8a7 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/RASAeroSaver.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/RASAeroSaver.java @@ -9,8 +9,8 @@ import info.openrocket.core.rocketcomponent.Rocket; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; import java.io.BufferedWriter; import java.io.IOException; import java.io.OutputStream; diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/RecoveryDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/RecoveryDTO.java index 956dea045..d0c46a1e9 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/RecoveryDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/RecoveryDTO.java @@ -16,12 +16,12 @@ import info.openrocket.core.startup.Application; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.LinkedList; import java.util.List; diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/RocketDesignDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/RocketDesignDTO.java index 5597ef284..5114c0d53 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/RocketDesignDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/RocketDesignDTO.java @@ -15,13 +15,13 @@ import info.openrocket.core.rocketcomponent.Transition; import info.openrocket.core.startup.Application; import info.openrocket.core.util.ArrayList; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.List; import info.openrocket.core.file.rasaero.export.RASAeroSaver.RASAeroExportException; diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/SimulationDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/SimulationDTO.java index b1bef818e..8d46567ff 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/SimulationDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/SimulationDTO.java @@ -20,12 +20,12 @@ import info.openrocket.core.rocketcomponent.Rocket; import info.openrocket.core.rocketcomponent.StageSeparationConfiguration; import info.openrocket.core.startup.Application; -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.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/SimulationListDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/SimulationListDTO.java index b1cefa2ee..ad58776c7 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/SimulationListDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/SimulationListDTO.java @@ -13,10 +13,10 @@ import info.openrocket.core.rocketcomponent.MotorMount; import info.openrocket.core.rocketcomponent.Rocket; import info.openrocket.core.rocketcomponent.RocketComponent; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.HashMap; import java.util.LinkedList; import java.util.List; diff --git a/core/src/main/java/info/openrocket/core/file/rasaero/export/TransitionDTO.java b/core/src/main/java/info/openrocket/core/file/rasaero/export/TransitionDTO.java index be9d7cb65..fd714020b 100644 --- a/core/src/main/java/info/openrocket/core/file/rasaero/export/TransitionDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rasaero/export/TransitionDTO.java @@ -6,14 +6,14 @@ import info.openrocket.core.l10n.Translator; import info.openrocket.core.logging.ErrorSet; import info.openrocket.core.logging.WarningSet; -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.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import info.openrocket.core.file.rasaero.export.RASAeroSaver.RASAeroExportException; import info.openrocket.core.rocketcomponent.SymmetricComponent; diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java index 19c95433d..6f81db496 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java @@ -15,12 +15,12 @@ import info.openrocket.core.rocketcomponent.RocketComponent; import info.openrocket.core.rocketcomponent.Transition; import info.openrocket.core.rocketcomponent.TubeCoupler; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlElementWrapper; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/BasePartDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/BasePartDTO.java index edb7e421e..2bde31409 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/BasePartDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/BasePartDTO.java @@ -1,9 +1,9 @@ package info.openrocket.core.file.rocksim.export; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import info.openrocket.core.file.rocksim.RockSimCommonConstants; import info.openrocket.core.file.rocksim.RockSimDensityType; diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java index 5442272c3..6ab91d72e 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java @@ -18,13 +18,13 @@ import info.openrocket.core.rocketcomponent.Transition; import info.openrocket.core.rocketcomponent.TubeCoupler; import info.openrocket.core.rocketcomponent.TubeFinSet; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/BulkheadDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/BulkheadDTO.java index 69f41d6e7..4606d23b1 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/BulkheadDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/BulkheadDTO.java @@ -3,9 +3,9 @@ package info.openrocket.core.file.rocksim.export; import info.openrocket.core.file.rocksim.RockSimCommonConstants; import info.openrocket.core.rocketcomponent.Bulkhead; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; /** * Conversion of an OR Bulkhead to an RockSim Bulkhead. Bulkheads are diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/CenteringRingDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/CenteringRingDTO.java index 9c9394cd1..8be2a68b7 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/CenteringRingDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/CenteringRingDTO.java @@ -4,11 +4,11 @@ import info.openrocket.core.file.rocksim.RockSimCommonConstants; import info.openrocket.core.rocketcomponent.RadiusRingComponent; import info.openrocket.core.rocketcomponent.ThicknessRingComponent; -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.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; /** * Centering ring conversion from OR to RockSim. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/CustomFinSetDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/CustomFinSetDTO.java index ddd670162..a14d2e475 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/CustomFinSetDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/CustomFinSetDTO.java @@ -4,10 +4,10 @@ import info.openrocket.core.file.rocksim.RockSimCommonConstants; import info.openrocket.core.rocketcomponent.FreeformFinSet; import info.openrocket.core.util.Coordinate; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** */ diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/EngineBlockDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/EngineBlockDTO.java index 1d7b7f6b4..32788d7aa 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/EngineBlockDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/EngineBlockDTO.java @@ -2,9 +2,9 @@ package info.openrocket.core.file.rocksim.export; import info.openrocket.core.rocketcomponent.EngineBlock; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; /** * Models a Rocksim XML Element for an EngineBlock. EngineBlocks in Rocksim are diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/FinSetDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/FinSetDTO.java index d8e5f757d..2de813234 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/FinSetDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/FinSetDTO.java @@ -8,10 +8,10 @@ import info.openrocket.core.rocketcomponent.FreeformFinSet; import info.openrocket.core.rocketcomponent.TrapezoidFinSet; import info.openrocket.core.rocketcomponent.position.AxialMethod; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * This class models XML elements for Rocksim finsets. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/InnerBodyTubeDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/InnerBodyTubeDTO.java index 8cf57fbd7..b5a13f346 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/InnerBodyTubeDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/InnerBodyTubeDTO.java @@ -2,9 +2,9 @@ package info.openrocket.core.file.rocksim.export; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import info.openrocket.core.file.rocksim.RockSimCommonConstants; import info.openrocket.core.rocketcomponent.BodyTube; diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/LaunchLugDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/LaunchLugDTO.java index a158d81f1..93e331da0 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/LaunchLugDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/LaunchLugDTO.java @@ -1,9 +1,9 @@ package info.openrocket.core.file.rocksim.export; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import info.openrocket.core.file.rocksim.RockSimCommonConstants; import info.openrocket.core.rocketcomponent.LaunchLug; diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/MassObjectDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/MassObjectDTO.java index 23d1c4647..c9d2b71ba 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/MassObjectDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/MassObjectDTO.java @@ -3,10 +3,10 @@ package info.openrocket.core.file.rocksim.export; import info.openrocket.core.file.rocksim.RockSimCommonConstants; import info.openrocket.core.rocketcomponent.MassObject; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * Class that models a Rocksim MassObject. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/NoseConeDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/NoseConeDTO.java index 9e643d24b..851cb539b 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/NoseConeDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/NoseConeDTO.java @@ -3,10 +3,10 @@ package info.openrocket.core.file.rocksim.export; import info.openrocket.core.file.rocksim.RockSimCommonConstants; import info.openrocket.core.rocketcomponent.NoseCone; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * This class models a RockSim XML Element for a nose cone. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/ParachuteDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/ParachuteDTO.java index 03fab5125..87da492ce 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/ParachuteDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/ParachuteDTO.java @@ -4,10 +4,10 @@ import info.openrocket.core.file.rocksim.RockSimCommonConstants; import info.openrocket.core.file.rocksim.importt.BaseHandler; import info.openrocket.core.rocketcomponent.Parachute; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** */ diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/PodSetDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/PodSetDTO.java index 979c9577e..5d3f3218c 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/PodSetDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/PodSetDTO.java @@ -9,13 +9,13 @@ import info.openrocket.core.rocketcomponent.Transition; import info.openrocket.core.rocketcomponent.position.AxialMethod; import info.openrocket.core.rocketcomponent.position.RadiusMethod; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/RockSimDesignDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/RockSimDesignDTO.java index ef01b952c..5f0f7f901 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/RockSimDesignDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/RockSimDesignDTO.java @@ -2,9 +2,9 @@ package info.openrocket.core.file.rocksim.export; import info.openrocket.core.file.rocksim.RockSimCommonConstants; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; /** * High-level placeholder element for Rocksim. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/RockSimDocumentDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/RockSimDocumentDTO.java index f9aa83bc0..1cfa46751 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/RockSimDocumentDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/RockSimDocumentDTO.java @@ -2,10 +2,10 @@ package info.openrocket.core.file.rocksim.export; import info.openrocket.core.file.rocksim.RockSimCommonConstants; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * The top level Rocksim document. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/RockSimSaver.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/RockSimSaver.java index bde36f871..69b6c1e1a 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/RockSimSaver.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/RockSimSaver.java @@ -7,8 +7,8 @@ import java.io.OutputStreamWriter; import java.io.StringWriter; import java.nio.charset.StandardCharsets; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; import info.openrocket.core.logging.ErrorSet; import info.openrocket.core.logging.WarningSet; diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/RocketDesignDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/RocketDesignDTO.java index a008377c1..d35e33bc4 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/RocketDesignDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/RocketDesignDTO.java @@ -1,8 +1,8 @@ package info.openrocket.core.file.rocksim.export; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; /** * This class models a Rocksim XML element for a rocket design container. It's diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/StageDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/StageDTO.java index 0f131cd67..58588f748 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/StageDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/StageDTO.java @@ -8,10 +8,10 @@ import info.openrocket.core.rocketcomponent.AxialStage; import info.openrocket.core.rocketcomponent.Transition; import info.openrocket.core.util.ArrayList; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; import java.util.List; /** diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/StreamerDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/StreamerDTO.java index 304eed549..0bc66d4f3 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/StreamerDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/StreamerDTO.java @@ -3,10 +3,10 @@ package info.openrocket.core.file.rocksim.export; import info.openrocket.core.file.rocksim.RockSimCommonConstants; import info.openrocket.core.rocketcomponent.Streamer; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * This class models a Rocksim XML element for a streamer. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/TransitionDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/TransitionDTO.java index ef4a7a684..94417dd0b 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/TransitionDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/TransitionDTO.java @@ -3,10 +3,10 @@ package info.openrocket.core.file.rocksim.export; import info.openrocket.core.file.rocksim.RockSimCommonConstants; import info.openrocket.core.rocketcomponent.Transition; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * This class models a transition XML element in Rocksim file format. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/TubeCouplerDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/TubeCouplerDTO.java index b8b4a820d..9ba01a36d 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/TubeCouplerDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/TubeCouplerDTO.java @@ -16,9 +16,9 @@ import info.openrocket.core.rocketcomponent.Transition; import info.openrocket.core.rocketcomponent.TubeCoupler; import info.openrocket.core.rocketcomponent.position.AxialMethod; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/TubeFinSetDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/TubeFinSetDTO.java index 83ff32778..8fa6b69da 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/TubeFinSetDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/TubeFinSetDTO.java @@ -3,10 +3,10 @@ package info.openrocket.core.file.rocksim.export; import info.openrocket.core.file.rocksim.RockSimCommonConstants; import info.openrocket.core.rocketcomponent.TubeFinSet; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; /** * This class models an XML element for a Rocksim TubeFinSet. diff --git a/core/src/main/java/info/openrocket/core/preset/xml/BaseComponentDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/BaseComponentDTO.java index ec64fb153..529873964 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/BaseComponentDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/BaseComponentDTO.java @@ -7,15 +7,15 @@ import java.io.IOException; import java.util.List; import javax.imageio.ImageIO; -import javax.xml.bind.DatatypeConverter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlInlineBinaryData; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.XmlAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.DatatypeConverter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlInlineBinaryData; +import jakarta.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import info.openrocket.core.database.Databases; import info.openrocket.core.material.Material; diff --git a/core/src/main/java/info/openrocket/core/preset/xml/BodyTubeDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/BodyTubeDTO.java index 209de8ccb..f86cb5f10 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/BodyTubeDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/BodyTubeDTO.java @@ -6,10 +6,10 @@ import info.openrocket.core.preset.ComponentPresetFactory; import info.openrocket.core.preset.InvalidComponentPresetException; import info.openrocket.core.preset.TypedPropertyMap; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; /** diff --git a/core/src/main/java/info/openrocket/core/preset/xml/BulkHeadDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/BulkHeadDTO.java index 0a5f1f4bb..4f91147d1 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/BulkHeadDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/BulkHeadDTO.java @@ -6,10 +6,10 @@ import info.openrocket.core.preset.ComponentPresetFactory; import info.openrocket.core.preset.InvalidComponentPresetException; import info.openrocket.core.preset.TypedPropertyMap; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; /** diff --git a/core/src/main/java/info/openrocket/core/preset/xml/CenteringRingDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/CenteringRingDTO.java index 2573dbb3f..999129ecb 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/CenteringRingDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/CenteringRingDTO.java @@ -3,9 +3,9 @@ package info.openrocket.core.preset.xml; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import info.openrocket.core.preset.ComponentPreset; import info.openrocket.core.preset.InvalidComponentPresetException; diff --git a/core/src/main/java/info/openrocket/core/preset/xml/EngineBlockDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/EngineBlockDTO.java index ab7d4db25..c4affefca 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/EngineBlockDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/EngineBlockDTO.java @@ -4,9 +4,9 @@ package info.openrocket.core.preset.xml; import info.openrocket.core.preset.ComponentPreset; import info.openrocket.core.preset.InvalidComponentPresetException; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; /** diff --git a/core/src/main/java/info/openrocket/core/preset/xml/LaunchLugDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/LaunchLugDTO.java index ad717d1ea..b77e0c425 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/LaunchLugDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/LaunchLugDTO.java @@ -6,10 +6,10 @@ import info.openrocket.core.preset.ComponentPresetFactory; import info.openrocket.core.preset.InvalidComponentPresetException; import info.openrocket.core.preset.TypedPropertyMap; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; /** diff --git a/core/src/main/java/info/openrocket/core/preset/xml/MaterialDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/MaterialDTO.java index 7541152a4..af2a3c80f 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/MaterialDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/MaterialDTO.java @@ -1,12 +1,12 @@ package info.openrocket.core.preset.xml; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import info.openrocket.core.database.Databases; import info.openrocket.core.material.Material; diff --git a/core/src/main/java/info/openrocket/core/preset/xml/NoseConeDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/NoseConeDTO.java index 7148d980f..b8f54edf5 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/NoseConeDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/NoseConeDTO.java @@ -2,10 +2,10 @@ package info.openrocket.core.preset.xml; import java.util.List; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import info.openrocket.core.preset.ComponentPreset; import info.openrocket.core.preset.ComponentPresetFactory; diff --git a/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentDTO.java index 41b4827f4..8ebd6756d 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentDTO.java @@ -3,14 +3,14 @@ package info.openrocket.core.preset.xml; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlValue; import info.openrocket.core.material.Material; import info.openrocket.core.preset.ComponentPreset; diff --git a/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentLoader.java b/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentLoader.java index c15571472..277b9044d 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentLoader.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentLoader.java @@ -6,7 +6,7 @@ import java.io.InputStreamReader; import java.util.Collection; import java.util.List; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java b/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java index 698629297..b3a422e1a 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java @@ -3,10 +3,10 @@ package info.openrocket.core.preset.xml; import info.openrocket.core.material.Material; import info.openrocket.core.preset.ComponentPreset; import info.openrocket.core.preset.InvalidComponentPresetException; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/info/openrocket/core/preset/xml/ParachuteDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/ParachuteDTO.java index d260b6e64..8a8961e01 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/ParachuteDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/ParachuteDTO.java @@ -6,10 +6,10 @@ import info.openrocket.core.preset.ComponentPreset; import info.openrocket.core.preset.ComponentPresetFactory; import info.openrocket.core.preset.InvalidComponentPresetException; import info.openrocket.core.preset.TypedPropertyMap; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; /** diff --git a/core/src/main/java/info/openrocket/core/preset/xml/RailButtonDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/RailButtonDTO.java index 7d0072110..09fcb115e 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/RailButtonDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/RailButtonDTO.java @@ -6,10 +6,10 @@ import info.openrocket.core.preset.ComponentPresetFactory; import info.openrocket.core.preset.InvalidComponentPresetException; import info.openrocket.core.preset.TypedPropertyMap; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; /** diff --git a/core/src/main/java/info/openrocket/core/preset/xml/ShapeDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/ShapeDTO.java index e2384bdfc..b8c4fd7bb 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/ShapeDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/ShapeDTO.java @@ -3,7 +3,7 @@ package info.openrocket.core.preset.xml; import info.openrocket.core.rocketcomponent.Transition; -import javax.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnum; /** * A mirror class to Transition.Shape to adapt that class to/from XML. diff --git a/core/src/main/java/info/openrocket/core/preset/xml/StreamerDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/StreamerDTO.java index 9ade6d237..f348aa38e 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/StreamerDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/StreamerDTO.java @@ -6,10 +6,10 @@ import info.openrocket.core.preset.ComponentPresetFactory; import info.openrocket.core.preset.InvalidComponentPresetException; import info.openrocket.core.preset.TypedPropertyMap; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; /** diff --git a/core/src/main/java/info/openrocket/core/preset/xml/TransitionDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/TransitionDTO.java index 444114e37..2b95a0a40 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/TransitionDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/TransitionDTO.java @@ -6,10 +6,10 @@ import info.openrocket.core.preset.ComponentPresetFactory; import info.openrocket.core.preset.InvalidComponentPresetException; import info.openrocket.core.preset.TypedPropertyMap; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; /** diff --git a/core/src/main/java/info/openrocket/core/preset/xml/TubeCouplerDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/TubeCouplerDTO.java index 81d02ac75..ce8281f45 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/TubeCouplerDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/TubeCouplerDTO.java @@ -4,9 +4,9 @@ package info.openrocket.core.preset.xml; import info.openrocket.core.preset.ComponentPreset; import info.openrocket.core.preset.InvalidComponentPresetException; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; /** diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java index 367677dc2..f5375d208 100644 --- a/core/src/main/java/module-info.java +++ b/core/src/main/java/module-info.java @@ -19,9 +19,9 @@ open module info.openrocket.core { requires jakarta.activation; requires jakarta.inject; requires java.prefs; - requires java.xml.bind; + requires jakarta.xml.bind; requires io.github.classgraph; - requires java.json; + requires org.glassfish.jakarta.json; requires org.slf4j; requires com.opencsv; requires org.commonmark; diff --git a/core/src/test/java/info/openrocket/core/communication/UpdateInfoTest.java b/core/src/test/java/info/openrocket/core/communication/UpdateInfoTest.java index 56e91a82c..4d307333d 100644 --- a/core/src/test/java/info/openrocket/core/communication/UpdateInfoTest.java +++ b/core/src/test/java/info/openrocket/core/communication/UpdateInfoTest.java @@ -12,11 +12,11 @@ import info.openrocket.core.util.BaseTestCase; import org.junit.jupiter.api.Test; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; public class UpdateInfoTest extends BaseTestCase { diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/export/RockSimDocumentDTOTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/export/RockSimDocumentDTOTest.java index 48580769c..f1a5ee3bc 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/export/RockSimDocumentDTOTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/export/RockSimDocumentDTOTest.java @@ -11,8 +11,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.List; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; import info.openrocket.core.document.OpenRocketDocument; import info.openrocket.core.document.OpenRocketDocumentFactory; diff --git a/core/src/test/java/info/openrocket/core/preset/xml/BaseComponentDTOTest.java b/core/src/test/java/info/openrocket/core/preset/xml/BaseComponentDTOTest.java index fc639582d..b306a44bf 100644 --- a/core/src/test/java/info/openrocket/core/preset/xml/BaseComponentDTOTest.java +++ b/core/src/test/java/info/openrocket/core/preset/xml/BaseComponentDTOTest.java @@ -8,9 +8,9 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import javax.imageio.ImageIO; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import java.awt.image.BufferedImage; import java.awt.image.DataBufferByte; import java.io.StringReader; diff --git a/swing/build.gradle b/swing/build.gradle index f8068dc94..f5f8badec 100644 --- a/swing/build.gradle +++ b/swing/build.gradle @@ -95,7 +95,6 @@ dependencies { implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.5.0' implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.0' - implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' implementation group: 'org.jogamp.gluegen', name: 'gluegen-rt-main', version:'2.5.0' implementation group: 'org.jogamp.jogl', name: 'jogl-all-main', version: '2.5.0' diff --git a/swing/src/main/java/info/openrocket/swing/utils/ComponentPresetEditor.java b/swing/src/main/java/info/openrocket/swing/utils/ComponentPresetEditor.java index a93b1e0c6..f43919f28 100644 --- a/swing/src/main/java/info/openrocket/swing/utils/ComponentPresetEditor.java +++ b/swing/src/main/java/info/openrocket/swing/utils/ComponentPresetEditor.java @@ -28,7 +28,7 @@ import javax.swing.JSeparator; import javax.swing.JTable; import javax.swing.SwingUtilities; import javax.swing.table.DefaultTableModel; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import net.miginfocom.swing.MigLayout; import info.openrocket.swing.gui.preset.ButtonColumn; diff --git a/swing/src/main/java/module-info.java b/swing/src/main/java/module-info.java index 323043917..85fad34f7 100644 --- a/swing/src/main/java/module-info.java +++ b/swing/src/main/java/module-info.java @@ -17,7 +17,7 @@ open module info.openrocket.swing { requires org.jogamp.jogl.all; requires java.scripting; requires org.fife.RSyntaxTextArea; - requires java.xml.bind; + requires jakarta.xml.bind; requires jcommon; requires java.prefs; requires com.jthemedetector;