Skip to content

Commit 7041fa3

Browse files
qcdyxqcdyx
authored
upgraded to Java 17 (#200)
1 parent 57146b4 commit 7041fa3

36 files changed

Lines changed: 533 additions & 366 deletions

‎.github/workflows/test_package.yml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33

44
name: Test and Package
55

6+
env:
7+
JAVA_VERSION: '17'
8+
69
on:
710
push:
811
branches: [ master ]
@@ -19,11 +22,11 @@ jobs:
1922
test:
2023
runs-on: ubuntu-latest
2124
steps:
22-
- uses: actions/checkout@v2
23-
- name: Set up JDK 11
24-
uses: actions/setup-java@v2
25+
- uses: actions/checkout@v6
26+
- name: Set up JDK ${{ env.JAVA_VERSION }}
27+
uses: actions/setup-java@v5
2528
with:
26-
java-version: '11'
29+
java-version: ${{ env.JAVA_VERSION }}
2730
distribution: 'temurin'
2831
cache: maven
2932
- name: Run Java tests
@@ -40,11 +43,11 @@ jobs:
4043
needs: [test]
4144
runs-on: ubuntu-latest
4245
steps:
43-
- uses: actions/checkout@v2
44-
- name: Set up JDK 11
45-
uses: actions/setup-java@v2
46+
- uses: actions/checkout@v6
47+
- name: Set up JDK ${{ env.JAVA_VERSION }}
48+
uses: actions/setup-java@v5
4649
with:
47-
java-version: '11'
50+
java-version: ${{ env.JAVA_VERSION }}
4851
distribution: 'temurin'
4952
cache: maven
5053
- name: Deploy to Github Package Registry

‎.mvn/maven.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
--settings ./.mvn/custom-settings.xml

‎gtfs-realtime-validator-lib/pom.xml‎

Lines changed: 36 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,21 @@
4343
<groupId>org.onebusaway</groupId>
4444
<artifactId>onebusaway-gtfs</artifactId>
4545
<version>1.3.87</version>
46+
<exclusions>
47+
<!-- Old legacy coordinates (c3p0:c3p0:0.9.1.2) break Java 6+ JDBC APIs (e.g., Connection#createClob). -->
48+
<exclusion>
49+
<groupId>c3p0</groupId>
50+
<artifactId>c3p0</artifactId>
51+
</exclusion>
52+
</exclusions>
4653
</dependency>
54+
55+
<!-- Ensure we have the modern c3p0 implementation on the classpath (version pinned in parent) -->
56+
<dependency>
57+
<groupId>com.mchange</groupId>
58+
<artifactId>c3p0</artifactId>
59+
</dependency>
60+
4761
<!-- Command line parameter parsing -->
4862
<dependency>
4963
<groupId>commons-cli</groupId>
@@ -84,20 +98,21 @@
8498
<version>4.13.1</version>
8599
</dependency>
86100
<dependency>
87-
<groupId>javax.validation</groupId>
88-
<artifactId>validation-api</artifactId>
89-
<version>2.0.0.Final</version>
101+
<groupId>jakarta.validation</groupId>
102+
<artifactId>jakarta.validation-api</artifactId>
103+
<version>3.0.2</version>
90104
</dependency>
91-
<!-- Hibernate -->
105+
<!-- Jakarta Persistence API -->
92106
<dependency>
93-
<groupId>org.hibernate</groupId>
94-
<artifactId>hibernate-core</artifactId>
95-
<version>5.6.7.Final</version>
107+
<groupId>jakarta.persistence</groupId>
108+
<artifactId>jakarta.persistence-api</artifactId>
109+
<version>3.1.0</version>
96110
</dependency>
111+
<!-- Hibernate -->
97112
<dependency>
98-
<groupId>org.javassist</groupId>
99-
<artifactId>javassist</artifactId>
100-
<version>3.28.0-GA</version>
113+
<groupId>org.hibernate.orm</groupId>
114+
<artifactId>hibernate-core</artifactId>
115+
<version>6.4.4.Final</version>
101116
</dependency>
102117
<!-- Spatial operations -->
103118
<dependency>
@@ -130,8 +145,8 @@
130145
<artifactId>maven-compiler-plugin</artifactId>
131146
<version>3.7.0</version>
132147
<configuration>
133-
<source>1.8</source>
134-
<target>1.8</target>
148+
<source>17</source>
149+
<target>17</target>
135150
</configuration>
136151
</plugin>
137152

@@ -144,7 +159,13 @@
144159
<include>**/*Spec.*</include>
145160
<include>**/*Test.*</include>
146161
</includes>
147-
<argLine>-Xmx4G -Xms1G</argLine>
162+
<argLine>-Xmx4G -Xms1G
163+
--add-opens java.base/java.lang=ALL-UNNAMED
164+
--add-opens java.base/java.io=ALL-UNNAMED
165+
--add-opens java.base/java.util=ALL-UNNAMED
166+
--add-opens java.base/java.util.concurrent=ALL-UNNAMED
167+
--add-opens java.base/java.lang.reflect=ALL-UNNAMED
168+
--add-opens java.base/java.math=ALL-UNNAMED</argLine>
148169
</configuration>
149170
</plugin>
150171

@@ -188,6 +209,8 @@
188209
</filter>
189210
</filters>
190211

212+
<!-- Attach the uber-jar as a secondary artifact so the main jar stays dependency-clean -->
213+
<shadedArtifactAttached>true</shadedArtifactAttached>
191214
<shadedClassifierName>withAllDependencies</shadedClassifierName>
192215
<transformers>
193216
<transformer

‎gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/ErrorMessageModel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package edu.usf.cutr.gtfsrtvalidator.lib.model;
1919

20-
import javax.xml.bind.annotation.XmlRootElement;
20+
import jakarta.xml.bind.annotation.XmlRootElement;
2121

2222
@XmlRootElement
2323
public class ErrorMessageModel {

‎gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedIterationModel.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package edu.usf.cutr.gtfsrtvalidator.lib.model;
1919

20-
import javax.persistence.*;
21-
import javax.xml.bind.annotation.XmlRootElement;
20+
import jakarta.persistence.*;
21+
import jakarta.xml.bind.annotation.XmlRootElement;
2222
import java.io.Serializable;
2323

2424
@XmlRootElement
@@ -31,7 +31,7 @@ public GtfsFeedIterationModel() {}
3131
@Id
3232
@Column(name="IterationID")
3333
@GeneratedValue(strategy=GenerationType.IDENTITY)
34-
private int IterationId;
34+
private Integer IterationId;
3535
@Column(name="IterationTimestamp")
3636
private long timeStamp;
3737
@ManyToOne
@@ -46,11 +46,11 @@ public void setGtfsFeedModel(GtfsFeedModel gtfsFeedModel) {
4646
this.gtfsFeedModel = gtfsFeedModel;
4747
}
4848

49-
public int getIterationId() {
49+
public Integer getIterationId() {
5050
return IterationId;
5151
}
5252

53-
public void setIterationId(int iterationId) {
53+
public void setIterationId(Integer iterationId) {
5454
IterationId = iterationId;
5555
}
5656

‎gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsFeedModel.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package edu.usf.cutr.gtfsrtvalidator.lib.model;
1919

20-
import javax.persistence.*;
21-
import javax.xml.bind.annotation.XmlRootElement;
20+
import jakarta.persistence.*;
21+
import jakarta.xml.bind.annotation.XmlRootElement;
2222
import java.io.Serializable;
2323

2424
@XmlRootElement
@@ -31,7 +31,7 @@ public class GtfsFeedModel implements Serializable {
3131
@Id
3232
@GeneratedValue(strategy=GenerationType.IDENTITY)
3333
@Column(name="feedID")
34-
private int feedId;
34+
private Integer feedId;
3535
@Column(name="downloadTimestamp")
3636
private long startTime;
3737
@Column(name="fileLocation")
@@ -54,11 +54,11 @@ public void setGtfsUrl(String gtfsUrl) {
5454
this.gtfsUrl = gtfsUrl;
5555
}
5656

57-
public int getFeedId() {
57+
public Integer getFeedId() {
5858
return feedId;
5959
}
6060

61-
public void setFeedId(int feedId) {
61+
public void setFeedId(Integer feedId) {
6262
this.feedId = feedId;
6363
}
6464

‎gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedIterationModel.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package edu.usf.cutr.gtfsrtvalidator.lib.model;
1919

20-
import javax.persistence.*;
21-
import javax.xml.bind.annotation.XmlRootElement;
20+
import jakarta.persistence.*;
21+
import jakarta.xml.bind.annotation.XmlRootElement;
2222
import java.io.Serializable;
2323

2424
@XmlRootElement
@@ -39,7 +39,7 @@ public GtfsRtFeedIterationModel(long timeStamp, long feedTimestamp, byte[] feedp
3939
@Id
4040
@Column(name="IterationID")
4141
@GeneratedValue(strategy=GenerationType.IDENTITY)
42-
private int IterationId;
42+
private Integer IterationId;
4343
@Column(name="IterationTimestamp")
4444
private long timeStamp;
4545
@Column(name = "feedTimestamp")
@@ -68,11 +68,11 @@ public void setGtfsRtFeedModel(GtfsRtFeedModel gtfsRtFeedModel) {
6868
this.gtfsRtFeedModel = gtfsRtFeedModel;
6969
}
7070

71-
public int getIterationId() {
71+
public Integer getIterationId() {
7272
return IterationId;
7373
}
7474

75-
public void setIterationId(int iterationId) {
75+
public void setIterationId(Integer iterationId) {
7676
IterationId = iterationId;
7777
}
7878

‎gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedIterationString.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import com.google.transit.realtime.GtfsRealtime;
2222
import com.googlecode.protobuf.format.JsonFormat;
2323

24-
import javax.xml.bind.annotation.XmlElement;
25-
import javax.xml.bind.annotation.XmlRootElement;
24+
import jakarta.xml.bind.annotation.XmlElement;
25+
import jakarta.xml.bind.annotation.XmlRootElement;
2626

2727
@XmlRootElement
2828
public class GtfsRtFeedIterationString {

‎gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/GtfsRtFeedModel.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package edu.usf.cutr.gtfsrtvalidator.lib.model;
1919

20-
import javax.persistence.*;
21-
import javax.xml.bind.annotation.XmlRootElement;
20+
import jakarta.persistence.*;
21+
import jakarta.xml.bind.annotation.XmlRootElement;
2222
import java.io.Serializable;
2323

2424
@XmlRootElement
@@ -34,7 +34,7 @@ public class GtfsRtFeedModel implements Serializable {
3434
@Id
3535
@GeneratedValue(strategy=GenerationType.IDENTITY)
3636
@Column(name="rtFeedID")
37-
private int gtfsRtId;
37+
private Integer gtfsRtId;
3838
@Transient
3939
private boolean enableShapes;
4040

@@ -56,11 +56,11 @@ public void setGtfsFeedModel(GtfsFeedModel gtfsFeedModel) {
5656
this.gtfsFeedModel = gtfsFeedModel;
5757
}
5858

59-
public int getGtfsRtId() {
59+
public Integer getGtfsRtId() {
6060
return gtfsRtId;
6161
}
6262

63-
public void setGtfsRtId(int gtfsRtId) {
63+
public void setGtfsRtId(Integer gtfsRtId) {
6464
this.gtfsRtId = gtfsRtId;
6565
}
6666

‎gtfs-realtime-validator-lib/src/main/java/edu/usf/cutr/gtfsrtvalidator/lib/model/MessageLogModel.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package edu.usf.cutr.gtfsrtvalidator.lib.model;
1919

20-
import javax.persistence.*;
21-
import javax.xml.bind.annotation.XmlRootElement;
20+
import jakarta.persistence.*;
21+
import jakarta.xml.bind.annotation.XmlRootElement;
2222
import java.io.Serializable;
2323

2424
@XmlRootElement
@@ -35,7 +35,7 @@ public MessageLogModel(ValidationRule validationRule) {
3535
@Id
3636
@Column(name="messageID")
3737
@GeneratedValue(strategy=GenerationType.IDENTITY)
38-
private int messageId;
38+
private Integer messageId;
3939
@ManyToOne
4040
@JoinColumn(name = "iterationID")
4141
private GtfsRtFeedIterationModel gtfsRtFeedIterationModel;
@@ -45,11 +45,11 @@ public MessageLogModel(ValidationRule validationRule) {
4545
@Column(name = "errorDetails")
4646
private String errorDetails;
4747

48-
public int getMessageId() {
48+
public Integer getMessageId() {
4949
return messageId;
5050
}
5151

52-
public void setMessageId(int messageId) {
52+
public void setMessageId(Integer messageId) {
5353
this.messageId = messageId;
5454
}
5555

0 commit comments

Comments
 (0)