Skip to content

Commit 96f7fa6

Browse files
authored
Upgrade Maven dependencies (#5553)
The following source code changes were required: * Whitespace changes from spotless * PMD warning suppressions for utility class tests * PMD warning rename from "BeanMembersShouldSerialize" to "NonSerializableClass" * Declared more class members as final
1 parent 7a2d336 commit 96f7fa6

File tree

25 files changed

+66
-38
lines changed

25 files changed

+66
-38
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88
}
99
dependencies {
10-
classpath 'com.hubspot.jinjava:jinjava:2.6.0'
10+
classpath 'com.hubspot.jinjava:jinjava:2.7.1'
1111
}
1212
}
1313

@@ -22,8 +22,8 @@ plugins {
2222
id 'visual-studio'
2323
id 'net.ltgt.errorprone' version '3.1.0' apply false
2424
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
25-
id 'com.diffplug.spotless' version '6.18.0' apply false
26-
id 'com.github.spotbugs' version '5.0.14' apply false
25+
id 'com.diffplug.spotless' version '6.20.0' apply false
26+
id 'com.github.spotbugs' version '5.1.3' apply false
2727
}
2828

2929
wpilibVersioning.buildServerMode = project.hasProperty('buildServer')

cameraserver/multiCameraServer/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ repositories {
2929
}
3030

3131
dependencies {
32-
implementation 'com.google.code.gson:gson:2.8.9'
32+
implementation 'com.google.code.gson:gson:2.10.1'
3333

3434
implementation project(':wpiutil')
3535
implementation project(':wpinet')

cscore/src/main/java/edu/wpi/first/cscore/CameraServerCvJNI.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public static native int createCvSource(
6565
public static native void putSourceFrame(int source, long imageNativeObj);
6666

6767
public static native int createCvSink(String name);
68+
6869
// public static native int createCvSinkCallback(String name,
6970
// void (*processFrame)(long time));
7071

fieldImages/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ if (!project.hasProperty('onlylinuxathena')) {
1414
}
1515

1616
dependencies {
17-
implementation "com.fasterxml.jackson.core:jackson-annotations:2.12.4"
18-
implementation "com.fasterxml.jackson.core:jackson-core:2.12.4"
19-
implementation "com.fasterxml.jackson.core:jackson-databind:2.12.4"
17+
implementation "com.fasterxml.jackson.core:jackson-annotations:2.15.2"
18+
implementation "com.fasterxml.jackson.core:jackson-core:2.15.2"
19+
implementation "com.fasterxml.jackson.core:jackson-databind:2.15.2"
2020
}
2121

2222
ext {

hal/src/main/java/edu/wpi/first/hal/AccumulatorResult.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
public class AccumulatorResult {
1010
/** The total value accumulated. */
1111
public long value;
12+
1213
/** The number of sample value was accumulated over. */
1314
public long count;
1415

hal/src/main/java/edu/wpi/first/hal/AnalogJNI.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// the WPILib BSD license file in the root directory of this project.
44

55
package edu.wpi.first.hal;
6+
67
/**
78
* Analog Input / Output / Accumulator / Trigger JNI Functions.
89
*
@@ -19,10 +20,13 @@ public class AnalogJNI extends JNIWrapper {
1920
public interface AnalogTriggerType {
2021
/** <i>native declaration : AthenaJava\target\native\include\HAL\Analog.h:54</i> */
2122
int kInWindow = 0;
23+
2224
/** <i>native declaration : AthenaJava\target\native\include\HAL\Analog.h:55</i> */
2325
int kState = 1;
26+
2427
/** <i>native declaration : AthenaJava\target\native\include\HAL\Analog.h:56</i> */
2528
int kRisingPulse = 2;
29+
2630
/** <i>native declaration : AthenaJava\target\native\include\HAL\Analog.h:57</i> */
2731
int kFallingPulse = 3;
2832
}
@@ -52,6 +56,7 @@ public interface AnalogTriggerType {
5256
* @see "HAL_InitializeAnalogOutputPort"
5357
*/
5458
public static native int initializeAnalogOutputPort(int halPortHandle);
59+
5560
/**
5661
* Frees an analog output port.
5762
*
@@ -206,6 +211,7 @@ public interface AnalogTriggerType {
206211
* @see "HAL_GetAnalogVoltsToValue"
207212
*/
208213
public static native int getAnalogVoltsToValue(int analogPortHandle, double voltage);
214+
209215
/**
210216
* Get the analog voltage from a raw value.
211217
*
@@ -418,6 +424,7 @@ public static native void setAnalogTriggerLimitsDutyCycle(
418424
*/
419425
public static native void setAnalogTriggerLimitsVoltage(
420426
int analogTriggerHandle, double lower, double upper);
427+
421428
/**
422429
* Configures the analog trigger to use the averaged vs. raw values.
423430
*
@@ -433,6 +440,7 @@ public static native void setAnalogTriggerLimitsVoltage(
433440
*/
434441
public static native void setAnalogTriggerAveraged(
435442
int analogTriggerHandle, boolean useAveragedValue);
443+
436444
/**
437445
* Configures the analog trigger to use a filtered value.
438446
*

hal/src/main/java/edu/wpi/first/hal/CANData.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
public class CANData {
99
/** Contents of the CAN frame. */
1010
public final byte[] data = new byte[8];
11+
1112
/** Length of the frame in bytes. */
1213
public int length;
14+
1315
/** CAN frame timestamp in milliseconds. */
1416
public long timestamp;
1517

ntcore/src/generate/java/NetworkTableInstance.java.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ public final class NetworkTableInstance implements AutoCloseable {
553553
}
554554
}
555555

556-
private ListenerStorage m_listeners = new ListenerStorage(this);
556+
private final ListenerStorage m_listeners = new ListenerStorage(this);
557557

558558
/**
559559
* Remove a connection listener.

shared/java/javacommon.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ tasks.withType(JavaCompile).configureEach {
116116
}
117117

118118
dependencies {
119-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
120-
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
121-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
119+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'
120+
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.0'
121+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
122122

123123
devImplementation sourceSets.main.output
124124
}
@@ -132,7 +132,7 @@ task run(type: JavaExec) {
132132
build.dependsOn devClasses
133133

134134
jacoco {
135-
toolVersion = "0.8.8"
135+
toolVersion = "0.8.10"
136136
}
137137

138138
jacocoTestReport {

shared/java/javastyle.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ if (!project.hasProperty('skipJavaFormat')) {
22
apply plugin: 'checkstyle'
33

44
checkstyle {
5-
toolVersion = "10.1"
5+
toolVersion = "10.12.2"
66
configDirectory = file("${project.rootDir}/styleguide")
77
config = resources.text.fromFile(new File(configDirectory.get().getAsFile(), "checkstyle.xml"))
88
}
99

1010
apply plugin: 'pmd'
1111

1212
pmd {
13-
toolVersion = '6.44.0'
13+
toolVersion = '6.55.0'
1414
consoleOutput = true
1515
reportsDir = file("$project.buildDir/reports/pmd")
1616
ruleSetFiles = files(new File(rootDir, "styleguide/pmd-ruleset.xml"))

0 commit comments

Comments
 (0)