Skip to content

Commit 08fe328

Browse files
committed
Update Gradle build to use Java 17 for the following reasons:
- the new static code analysis plugins require a more modern version of Java - the upcoming web app will target a Java 17 runtime environment All current subprojects still target a Java 8 runtime environment.
1 parent 3690cbc commit 08fe328

File tree

17 files changed

+56
-24
lines changed

17 files changed

+56
-24
lines changed

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import org.asciidoctor.gradle.jvm.pdf.AsciidoctorPdfTask
66
plugins {
77
distribution
88
id("com.netflix.nebula.ospackage") version "11.11.2"
9-
id("org.asciidoctor.jvm.convert") version "4.0.4"
10-
id("org.asciidoctor.jvm.pdf") version "4.0.4"
9+
id("org.asciidoctor.jvm.convert") version "4.0.5"
10+
id("org.asciidoctor.jvm.pdf") version "4.0.5"
1111
}
1212

1313
allprojects {

buildSrc/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ repositories {
1313
// Use the plugin portal to apply community plugins in convention plugins.
1414
gradlePluginPortal()
1515
}
16+

mmtc-core/build.gradle.kts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ val precompiledJniSpiceClasses by configurations.creating {
1111
isCanBeResolved = true
1212
}
1313

14+
java {
15+
sourceCompatibility = JavaVersion.VERSION_1_8
16+
targetCompatibility = JavaVersion.VERSION_1_8
17+
}
18+
1419
dependencies {
1520
precompiledJniSpiceClasses(project(mapOf(
1621
"path" to ":jnispice",
@@ -34,6 +39,10 @@ dependencies {
3439
implementation(libs.log4j.jcl)
3540
implementation(libs.commons.io)
3641

42+
// provides javax.xml.bind classes
43+
implementation(libs.jakarta.xml)
44+
implementation(libs.jaxb.impl)
45+
3746
testImplementation(testlibs.junit.jupiter.api)
3847
testImplementation(testlibs.junit.jupiter.params)
3948
testImplementation(testlibs.junit.jupiter.engine)
@@ -82,7 +91,8 @@ val uberJar = tasks.register<Jar>("uberJar") {
8291
"Main-Class" to "edu.jhuapl.sd.sig.mmtc.app.MmtcCli",
8392
"Build-Date" to Instant.now().toString(),
8493
"Implementation-Version" to project.version,
85-
"Implementation-Title" to project.name
94+
"Implementation-Title" to project.name,
95+
"Multi-Release" to "true"
8696
)
8797
}
8898
}

mmtc-core/src/main/java/edu/jhuapl/sd/sig/mmtc/products/model/SclkScet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ public static SclkScet parseRecord(String record) throws TextProductException {
168168

169169
String sclk = fields[SCLK];
170170
String datetime = fields[SCET];
171-
Double dut = new Double(fields[DUT]);
172-
Double sclkrate = new Double(fields[SCLKRATE]);
171+
Double dut = Double.parseDouble(fields[DUT]);
172+
Double sclkrate = Double.parseDouble(fields[SCLKRATE]);
173173

174174
return new SclkScet(sclk, TimeConvert.parseIsoDoyUtcStr(datetime), dut, sclkrate);
175175
}

mmtc-core/src/main/java/edu/jhuapl/sd/sig/mmtc/products/model/SclkScetFile.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ private List<SclkScet> convertSclkKernelDataToScetData() throws TimeConvertExcep
339339
String[] fields = sclkKernelRecord.split("\\s+");
340340

341341
/* Convert the encoded SCLK back to regular SCLK ticks. */
342-
Double encSclk = new Double(fields[0]);
342+
Double encSclk = Double.parseDouble(fields[0]);
343343
sclkTicks = TimeConvert.encSclkToSclk(naifScId, clockTickRate, encSclk);
344344
logger.trace("SclkScetFile.List(): str encSclk = " + fields[0] + ", Double encSclk = " + encSclk);
345345

@@ -360,7 +360,7 @@ private List<SclkScet> convertSclkKernelDataToScetData() throws TimeConvertExcep
360360
dutval = getDutBefore(scetUtc);
361361

362362
/* The SCLK change rate is the same as the SCLK kernel clock change rate. */
363-
sclkrate = new Double(fields[2]);
363+
sclkrate = Double.parseDouble(fields[2]);
364364

365365

366366
logger.trace("SclkScetFile.List(): sclkTicks = " + sclkTicks + ", scetUtc = " + scetUtc +

mmtc-core/src/main/java/edu/jhuapl/sd/sig/mmtc/products/model/TextProduct.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.apache.logging.log4j.LogManager;
66
import org.apache.logging.log4j.Logger;
77

8-
import javax.xml.soap.Text;
98
import java.io.*;
109
import java.time.OffsetDateTime;
1110
import java.time.format.DateTimeFormatter;

mmtc-core/src/main/java/edu/jhuapl/sd/sig/mmtc/tlm/TimekeepingPacketParser.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
import java.util.Set;
1212

1313
import javax.xml.XMLConstants;
14-
import javax.xml.bind.JAXBContext;
15-
import javax.xml.bind.JAXBException;
16-
import javax.xml.bind.Unmarshaller;
14+
import jakarta.xml.bind.JAXBContext;
15+
import jakarta.xml.bind.JAXBException;
16+
import jakarta.xml.bind.Unmarshaller;
1717
import javax.xml.validation.Schema;
1818
import javax.xml.validation.SchemaFactory;
1919

mmtc-core/src/main/java/edu/jhuapl/sd/sig/mmtc/tlm/tkpacket/PacketDefinition.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import java.util.List;
44

5-
import javax.xml.bind.annotation.XmlElement;
6-
import javax.xml.bind.annotation.XmlRootElement;
5+
import jakarta.xml.bind.annotation.XmlElement;
6+
import jakarta.xml.bind.annotation.XmlRootElement;
77

88
/**
99
* Represents the Packet_Definition root element in the timekeeping packet definition

mmtc-core/src/main/java/edu/jhuapl/sd/sig/mmtc/tlm/tkpacket/TelemetryPoint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package edu.jhuapl.sd.sig.mmtc.tlm.tkpacket;
22

3-
import javax.xml.bind.annotation.XmlElement;
3+
import jakarta.xml.bind.annotation.XmlElement;
44

55
/**
66
* Represents a TelemetryPoint element found in the timekeeping packet definition XML file.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@XmlSchema(namespace = "mmtc", elementFormDefault = XmlNsForm.QUALIFIED)
22
package edu.jhuapl.sd.sig.mmtc.tlm.tkpacket;
33

4-
import javax.xml.bind.annotation.XmlNsForm;
5-
import javax.xml.bind.annotation.XmlSchema;
4+
import jakarta.xml.bind.annotation.XmlNsForm;
5+
import jakarta.xml.bind.annotation.XmlSchema;

0 commit comments

Comments
 (0)