Skip to content

Commit 404823d

Browse files
committed
Update for Java 21
Migrate all code and dependencies to Java21 from Java 17. Remove unnecessary .jar's and amend deprecated API calls.
1 parent 5b922e2 commit 404823d

13 files changed

Lines changed: 23 additions & 19 deletions

b6LabelServer/.classpath

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java 17 JDK">
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java 21 JDK">
44
<attributes>
55
<attribute name="module" value="true"/>
66
</attributes>
77
</classpathentry>
88
<classpathentry kind="src" path="src"/>
99
<classpathentry kind="lib" path="lib/commons-io-2.18.0.jar"/>
10-
<classpathentry kind="lib" path="lib/commons-lang3-3.16.0.jar"/>
11-
<classpathentry kind="lib" path="lib/commons-codec-1.17.1.jar"/>
12-
<classpathentry kind="lib" path="lib/opencsv-5.9.jar"/>
10+
<classpathentry kind="lib" path="lib/commons-lang3-3.17.0.jar"/>
11+
<classpathentry kind="lib" path="lib/commons-codec-1.18.0.jar"/>
12+
<classpathentry kind="lib" path="lib/opencsv-5.10.jar"/>
1313
<classpathentry kind="lib" path="xml/config"/>
1414
<classpathentry kind="lib" path="lib/log4j-api-2.24.3.jar"/>
1515
<classpathentry kind="lib" path="lib/log4j-core-2.24.3.jar"/>

b6LabelServer/.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>b6LabelServer</name>
3+
<name>b7LabelServer</name>
44
<comment></comment>
55
<projects>
66
</projects>

b6LabelServer/LabelServer.jar

25 Bytes
Binary file not shown.

b6LabelServer/MANIFEST.MF

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Manifest-Version: 1.0
22
Main-Class: com.commander4j.labeller.Service
33
Class-Path: lib/commons-beanutils-1.9.4.jar
4-
lib/commons-codec-1.17.1.jar
4+
lib/commons-codec-1.18.0.jar
55
lib/commons-collections-3.2.2.jar
66
lib/commons-collections4-4.4.jar
77
lib/commons-io-2.18.0.jar
8-
lib/commons-lang3-3.16.0.jar
8+
lib/commons-lang3-3.17.0.jar
99
lib/commons-logging-1.3.4.jar
1010
lib/commons-text-1.13.0.jar
1111
lib/log4j-api-2.24.3.jar
1212
lib/log4j-core-2.24.3.jar
13-
lib/opencsv-5.9.jar
13+
lib/opencsv-5.10.jar
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
<artifactId>labeller-test</artifactId>
55
<version>1.0.0</version>
66
<packaging>pom</packaging>
7-
<properties>
8-
<revision>7.0.0</revision>
9-
</properties>
7+
8+
<properties>
9+
<maven.compiler.source>21</maven.compiler.source>
10+
<maven.compiler.target>21</maven.compiler.target>
11+
</properties>
1012
<!-- <repositories>
1113
<repository>
1214
<id>com.install4j</id>
@@ -25,7 +27,7 @@
2527
<dependency>
2628
<groupId>commons-codec</groupId>
2729
<artifactId>commons-codec</artifactId>
28-
<version>1.17.1</version>
30+
<version>1.18.0</version>
2931
</dependency>
3032
<!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
3133
<dependency>
@@ -55,7 +57,7 @@
5557
<dependency>
5658
<groupId>com.opencsv</groupId>
5759
<artifactId>opencsv</artifactId>
58-
<version>5.9</version>
60+
<version>5.10</version>
5961
</dependency>
6062
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
6163
<dependency>

b6LabelServer/build.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<project basedir="." default="build" name="b6LabelServer">
88
<property environment="env"/>
99
<property name="debuglevel" value="source,lines,vars"/>
10-
<property name="target" value="17"/>
11-
<property name="source" value="17"/>
10+
<property name="target" value="21"/>
11+
<property name="source" value="21"/>
1212
<path id="b6LabelServer.classpath">
1313
<pathelement location="bin"/>
1414
<pathelement location="xml/config"/>
@@ -18,8 +18,8 @@
1818
</path>
1919
<target name="init">
2020
<mkdir dir="bin"/>
21-
<copy includeemptydirs="false" todir="bin">
22-
<fileset dir="src">
21+
<copy includeemptydirs="false" todir="bin" overwrite="true" preservelastmodified="true">
22+
<fileset dir="src" excludes="**/doc-files/**">
2323
<exclude name="**/*.launch"/>
2424
<exclude name="**/*.java"/>
2525
</fileset>
@@ -36,12 +36,14 @@
3636
<javac debug="true" debuglevel="${debuglevel}" destdir="bin" includeantruntime="false" source="${source}" target="${target}">
3737
<src path="src"/>
3838
<classpath refid="b6LabelServer.classpath"/>
39+
<compilerarg value="-proc:full"/>
3940
</javac>
4041
</target>
4142
<target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects"/>
4243
<target name="Service">
4344
<java classname="com.commander4j.labeller.Service" failonerror="true" fork="yes">
4445
<classpath refid="run.Service.classpath"/>
46+
<compilerarg value="-proc:full"/>
4547
</java>
4648
</target>
4749
</project>

b6LabelServer/getdependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
mvn -f b6LabelServer_pom.xml clean dependency:copy-dependencies
1+
mvn -f b7LabelServer_pom.xml clean dependency:copy-dependencies
-364 KB
Binary file not shown.
364 KB
Binary file not shown.
-658 KB
Binary file not shown.

0 commit comments

Comments
 (0)