From 2569db1e714fd9e10d30537dc9aafee0dde42ccf Mon Sep 17 00:00:00 2001 From: rjasmin-camsys Date: Wed, 24 Jul 2024 11:51:00 -0400 Subject: [PATCH 01/12] changing to spring.security.version 5.4.11 https://github.com/camsys/onebusaway-application-modules/security/dependabot/193 --- onebusaway-admin-webapp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onebusaway-admin-webapp/pom.xml b/onebusaway-admin-webapp/pom.xml index 3af0b1bea..64ee9c2a2 100644 --- a/onebusaway-admin-webapp/pom.xml +++ b/onebusaway-admin-webapp/pom.xml @@ -13,7 +13,7 @@ 2.3.1 1.0.1 20.5 - 5.3.2.RELEASE + 5.4.11 /var/lib/oba/bundles/builder /var/lib/oba/bundles/staged /var/lib/oba/bundles/active From 46f9581bb4819c3c30fba34c212e1879652a68fd Mon Sep 17 00:00:00 2001 From: rjasmin-camsys Date: Wed, 24 Jul 2024 13:29:21 -0400 Subject: [PATCH 02/12] changing to org.apache.struts 2.5.33 https://github.com/camsys/onebusaway-application-modules/security/dependabot/180 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7091c31d0..cc205bd8e 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 8.0.1 - 2.5.31 + 2.5.33 2.4.0 5.2.24.RELEASE 1.1.7 From 9a6bc5171f57b6f563fb0e39b330be272a5ceec1 Mon Sep 17 00:00:00 2001 From: rjasmin-camsys Date: Wed, 24 Jul 2024 14:05:22 -0400 Subject: [PATCH 03/12] changing org.hsqldb to 2.7.1 https://github.com/camsys/onebusaway-application-modules/security/dependabot/154 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cc205bd8e..f2b296ef4 100644 --- a/pom.xml +++ b/pom.xml @@ -183,7 +183,7 @@ org.hsqldb hsqldb - 2.3.2 + 2.7.1 From 772306c7556179623e4b12eb45f5dbcdeb5f0320 Mon Sep 17 00:00:00 2001 From: rjasmin-camsys Date: Wed, 24 Jul 2024 14:38:43 -0400 Subject: [PATCH 04/12] changing spring.security.version to 5.7.12 https://github.com/camsys/onebusaway-application-modules/security/dependabot/189 --- onebusaway-admin-webapp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onebusaway-admin-webapp/pom.xml b/onebusaway-admin-webapp/pom.xml index 64ee9c2a2..ad4f35f84 100644 --- a/onebusaway-admin-webapp/pom.xml +++ b/onebusaway-admin-webapp/pom.xml @@ -13,7 +13,7 @@ 2.3.1 1.0.1 20.5 - 5.4.11 + 5.7.12 /var/lib/oba/bundles/builder /var/lib/oba/bundles/staged /var/lib/oba/bundles/active From 7d8e966debaa65326a3aeb3dfba6b421b275ec79 Mon Sep 17 00:00:00 2001 From: rjasmin-camsys Date: Wed, 24 Jul 2024 15:08:02 -0400 Subject: [PATCH 05/12] changing org.apache.commons to 1.26.0 https://github.com/camsys/onebusaway-application-modules/security/dependabot/184 --- onebusaway-alerts-persistence/pom.xml | 2 +- onebusaway-util/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/onebusaway-alerts-persistence/pom.xml b/onebusaway-alerts-persistence/pom.xml index 5a0f2e45c..d8959aea1 100644 --- a/onebusaway-alerts-persistence/pom.xml +++ b/onebusaway-alerts-persistence/pom.xml @@ -73,7 +73,7 @@ org.apache.commons commons-compress - 1.18 + 1.26.0 commons-lang diff --git a/onebusaway-util/pom.xml b/onebusaway-util/pom.xml index 69cd7b4c3..243b1c633 100644 --- a/onebusaway-util/pom.xml +++ b/onebusaway-util/pom.xml @@ -68,7 +68,7 @@ org.apache.commons commons-compress - 1.18 + 1.26.0 commons-lang From a3954a22627f159ee465316df1253e2cbcae65c9 Mon Sep 17 00:00:00 2001 From: rjasmin-camsys Date: Thu, 25 Jul 2024 11:15:20 -0400 Subject: [PATCH 06/12] changing com.google.code.gson to 2.8.9 https://github.com/camsys/onebusaway-application-modules/security/dependabot/167 --- onebusaway-alerts-persistence/pom.xml | 2 +- onebusaway-enterprise-webapp/pom.xml | 2 +- onebusaway-gtfsrt-integration-tests/pom.xml | 2 +- onebusaway-nextbus-api-webapp/pom.xml | 2 +- onebusaway-transit-data-federation/pom.xml | 2 +- onebusaway-util/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/onebusaway-alerts-persistence/pom.xml b/onebusaway-alerts-persistence/pom.xml index d8959aea1..4ae229110 100644 --- a/onebusaway-alerts-persistence/pom.xml +++ b/onebusaway-alerts-persistence/pom.xml @@ -41,7 +41,7 @@ com.google.code.gson gson - 2.1 + 2.8.9 joda-time diff --git a/onebusaway-enterprise-webapp/pom.xml b/onebusaway-enterprise-webapp/pom.xml index 0a6a95056..c7eb16e15 100644 --- a/onebusaway-enterprise-webapp/pom.xml +++ b/onebusaway-enterprise-webapp/pom.xml @@ -120,7 +120,7 @@ com.google.code.gson gson - 1.7.1 + 2.8.9 diff --git a/onebusaway-gtfsrt-integration-tests/pom.xml b/onebusaway-gtfsrt-integration-tests/pom.xml index 31c919b69..917cd724f 100644 --- a/onebusaway-gtfsrt-integration-tests/pom.xml +++ b/onebusaway-gtfsrt-integration-tests/pom.xml @@ -98,7 +98,7 @@ com.google.code.gson gson - 1.7.1 + 2.8.9 jar compile diff --git a/onebusaway-nextbus-api-webapp/pom.xml b/onebusaway-nextbus-api-webapp/pom.xml index c58c3b27a..bf73b3ff0 100644 --- a/onebusaway-nextbus-api-webapp/pom.xml +++ b/onebusaway-nextbus-api-webapp/pom.xml @@ -178,7 +178,7 @@ com.google.code.gson gson - 2.3.1 + 2.8.9 org.onebusaway.util diff --git a/onebusaway-transit-data-federation/pom.xml b/onebusaway-transit-data-federation/pom.xml index baf414b4a..f9b1985c8 100644 --- a/onebusaway-transit-data-federation/pom.xml +++ b/onebusaway-transit-data-federation/pom.xml @@ -176,7 +176,7 @@ com.google.code.gson gson - 1.7.1 + 2.8.9 jar compile diff --git a/onebusaway-util/pom.xml b/onebusaway-util/pom.xml index 243b1c633..0c83dd9bb 100644 --- a/onebusaway-util/pom.xml +++ b/onebusaway-util/pom.xml @@ -36,7 +36,7 @@ com.google.code.gson gson - 2.1 + 2.8.9 joda-time From 85e3989a97ff3422a39032a78dc9a72c905254a7 Mon Sep 17 00:00:00 2001 From: rjasmin-camsys Date: Fri, 26 Jul 2024 10:11:00 -0400 Subject: [PATCH 07/12] changing com.thoughtworks.xstream to 1.4.20 https://github.com/camsys/onebusaway-application-modules/security/dependabot/161 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f2b296ef4..4ec8341c4 100644 --- a/pom.xml +++ b/pom.xml @@ -355,7 +355,7 @@ com.thoughtworks.xstream xstream - 1.4.19 + 1.4.20 From c0fa905ffecbd0db5eb0111844a50dcc01a0e0c9 Mon Sep 17 00:00:00 2001 From: rjasmin-camsys Date: Fri, 26 Jul 2024 13:02:49 -0400 Subject: [PATCH 08/12] changing org.jsoup to 1.14.2, also slight change to VehicleBlockAssignmentAction to not use a deprecated function. https://github.com/camsys/onebusaway-application-modules/security/dependabot/120 --- onebusaway-admin-webapp/pom.xml | 2 +- .../vehicleblockassignment/VehicleBlockAssignmentAction.java | 3 +-- onebusaway-watchdog-webapp/pom.xml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/onebusaway-admin-webapp/pom.xml b/onebusaway-admin-webapp/pom.xml index ad4f35f84..c6c96f89d 100644 --- a/onebusaway-admin-webapp/pom.xml +++ b/onebusaway-admin-webapp/pom.xml @@ -310,7 +310,7 @@ org.jsoup jsoup - 1.10.1 + 1.14.2 diff --git a/onebusaway-admin-webapp/src/main/java/org/onebusaway/webapp/actions/admin/vehicleblockassignment/VehicleBlockAssignmentAction.java b/onebusaway-admin-webapp/src/main/java/org/onebusaway/webapp/actions/admin/vehicleblockassignment/VehicleBlockAssignmentAction.java index 932bd7396..5bf30b6c5 100644 --- a/onebusaway-admin-webapp/src/main/java/org/onebusaway/webapp/actions/admin/vehicleblockassignment/VehicleBlockAssignmentAction.java +++ b/onebusaway-admin-webapp/src/main/java/org/onebusaway/webapp/actions/admin/vehicleblockassignment/VehicleBlockAssignmentAction.java @@ -23,7 +23,6 @@ import org.apache.struts2.convention.annotation.Namespace; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; -import org.jsoup.helper.StringUtil; import org.onebusaway.admin.model.assignments.ActiveBlock; import org.onebusaway.admin.model.assignments.BlockSummary; import org.onebusaway.admin.service.assignments.VehicleAssignmentService; @@ -77,7 +76,7 @@ public String submit() throws ExecutionException { String blockId = blockSummary.getBlockId(); String vehicleId = blockSummary.getVehicleId(); - if(!StringUtil.isBlank(blockId) && (StringUtil.isBlank(vehicleId) || _activeVehicleIds.contains(vehicleId))) { + if(!StringUtils.isBlank(blockId) && (StringUtils.isBlank(vehicleId) || _activeVehicleIds.contains(vehicleId))) { vehicleAssignmentService.assign(blockId, vehicleId); } } diff --git a/onebusaway-watchdog-webapp/pom.xml b/onebusaway-watchdog-webapp/pom.xml index 14e6d22f4..913fbe4aa 100644 --- a/onebusaway-watchdog-webapp/pom.xml +++ b/onebusaway-watchdog-webapp/pom.xml @@ -119,7 +119,7 @@ org.jsoup jsoup - 1.8.3 + 1.14.2 From 14694fbcdfc6e4ef38c0d9a21ca8c4fbb8a80696 Mon Sep 17 00:00:00 2001 From: rjasmin-camsys Date: Fri, 26 Jul 2024 13:11:50 -0400 Subject: [PATCH 09/12] changing org.mybatis to 3.5.6 https://github.com/camsys/onebusaway-application-modules/security/dependabot/109 --- onebusaway-status-agent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onebusaway-status-agent/pom.xml b/onebusaway-status-agent/pom.xml index 595c73b35..b78a800e0 100644 --- a/onebusaway-status-agent/pom.xml +++ b/onebusaway-status-agent/pom.xml @@ -30,7 +30,7 @@ org.mybatis mybatis - 3.4.6 + 3.5.6 From ec2ef93768678c4c957a77c7f20749f089fc3aef Mon Sep 17 00:00:00 2001 From: rjasmin-camsys Date: Fri, 26 Jul 2024 13:16:48 -0400 Subject: [PATCH 10/12] changing commons-collections to 3.2.2 https://github.com/camsys/onebusaway-application-modules/security/dependabot/51 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4ec8341c4..0f776e373 100644 --- a/pom.xml +++ b/pom.xml @@ -194,7 +194,7 @@ commons-collections commons-collections - 3.2 + 3.2.2 commons-dbcp From 5b38a22115933f473a108846be4b79edfc0e15c4 Mon Sep 17 00:00:00 2001 From: sheldonabrown Date: Fri, 26 Jul 2024 13:34:25 -0400 Subject: [PATCH 11/12] changing version to reflect security testing --- onebusaway-admin-webapp/pom.xml | 2 +- onebusaway-agency-metadata/pom.xml | 2 +- onebusaway-alerts-api/pom.xml | 2 +- onebusaway-alerts-persistence/pom.xml | 2 +- onebusaway-api-core/pom.xml | 2 +- onebusaway-api-webapp/pom.xml | 2 +- onebusaway-combined-webapp/pom.xml | 2 +- onebusaway-container/pom.xml | 2 +- onebusaway-core/pom.xml | 2 +- onebusaway-enterprise-acta-webapp/pom.xml | 2 +- onebusaway-enterprise-webapp/pom.xml | 2 +- onebusaway-federations-webapp/pom.xml | 2 +- onebusaway-federations/pom.xml | 2 +- onebusaway-frontend-webapp/pom.xml | 2 +- onebusaway-geocoder/pom.xml | 2 +- onebusaway-geospatial/pom.xml | 2 +- onebusaway-gtfs-hibernate-spring/pom.xml | 2 +- onebusaway-gtfs-realtime-archiver/pom.xml | 2 +- onebusaway-gtfs-realtime-model/pom.xml | 4 ++-- onebusaway-gtfsrt-integration-tests/pom.xml | 2 +- onebusaway-gwt-common/pom.xml | 2 +- onebusaway-nextbus-api-webapp/pom.xml | 2 +- onebusaway-phone-webapp/pom.xml | 2 +- onebusaway-phone/pom.xml | 2 +- onebusaway-presentation/pom.xml | 2 +- onebusaway-quickstart/onebusaway-quickstart-assembly/pom.xml | 2 +- onebusaway-quickstart/onebusaway-quickstart-bootstrap/pom.xml | 2 +- onebusaway-quickstart/onebusaway-quickstart-common/pom.xml | 2 +- onebusaway-quickstart/onebusaway-quickstart-mains/pom.xml | 2 +- onebusaway-quickstart/onebusaway-quickstart-webapp/pom.xml | 2 +- onebusaway-quickstart/pom.xml | 2 +- onebusaway-realtime-api/pom.xml | 2 +- onebusaway-sms-webapp/pom.xml | 2 +- onebusaway-transit-data-federation-builder/pom.xml | 2 +- onebusaway-transit-data-federation-webapp/pom.xml | 2 +- onebusaway-transit-data-federation/pom.xml | 4 ++-- onebusaway-transit-data/pom.xml | 2 +- onebusaway-twilio-webapp/pom.xml | 2 +- onebusaway-users/pom.xml | 2 +- onebusaway-util/pom.xml | 2 +- onebusaway-watchdog-webapp/pom.xml | 2 +- pom.xml | 2 +- 42 files changed, 44 insertions(+), 44 deletions(-) diff --git a/onebusaway-admin-webapp/pom.xml b/onebusaway-admin-webapp/pom.xml index c6c96f89d..8a6969418 100644 --- a/onebusaway-admin-webapp/pom.xml +++ b/onebusaway-admin-webapp/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-admin-webapp war diff --git a/onebusaway-agency-metadata/pom.xml b/onebusaway-agency-metadata/pom.xml index 5e5e3adac..b8ff090a5 100644 --- a/onebusaway-agency-metadata/pom.xml +++ b/onebusaway-agency-metadata/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-agency-metadata jar diff --git a/onebusaway-alerts-api/pom.xml b/onebusaway-alerts-api/pom.xml index f8498db25..02ec1a300 100644 --- a/onebusaway-alerts-api/pom.xml +++ b/onebusaway-alerts-api/pom.xml @@ -3,7 +3,7 @@ onebusaway-application-modules org.onebusaway - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT 4.0.0 diff --git a/onebusaway-alerts-persistence/pom.xml b/onebusaway-alerts-persistence/pom.xml index 4ae229110..d3bd43404 100644 --- a/onebusaway-alerts-persistence/pom.xml +++ b/onebusaway-alerts-persistence/pom.xml @@ -4,7 +4,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-alerts-persistence diff --git a/onebusaway-api-core/pom.xml b/onebusaway-api-core/pom.xml index d41c5c8f4..fbf146d51 100644 --- a/onebusaway-api-core/pom.xml +++ b/onebusaway-api-core/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-api-core diff --git a/onebusaway-api-webapp/pom.xml b/onebusaway-api-webapp/pom.xml index cd5bae477..b07e4a072 100644 --- a/onebusaway-api-webapp/pom.xml +++ b/onebusaway-api-webapp/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-api-webapp war diff --git a/onebusaway-combined-webapp/pom.xml b/onebusaway-combined-webapp/pom.xml index 8e327f66a..637f4707e 100644 --- a/onebusaway-combined-webapp/pom.xml +++ b/onebusaway-combined-webapp/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-combined-webapp pom diff --git a/onebusaway-container/pom.xml b/onebusaway-container/pom.xml index bf84d5191..d2fd889fd 100644 --- a/onebusaway-container/pom.xml +++ b/onebusaway-container/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-container jar diff --git a/onebusaway-core/pom.xml b/onebusaway-core/pom.xml index f788a2772..dac808b13 100644 --- a/onebusaway-core/pom.xml +++ b/onebusaway-core/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-core jar diff --git a/onebusaway-enterprise-acta-webapp/pom.xml b/onebusaway-enterprise-acta-webapp/pom.xml index 349d9ef5f..d7ffc3eaa 100644 --- a/onebusaway-enterprise-acta-webapp/pom.xml +++ b/onebusaway-enterprise-acta-webapp/pom.xml @@ -4,7 +4,7 @@ onebusaway-application-modules org.onebusaway - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-enterprise-acta-webapp war diff --git a/onebusaway-enterprise-webapp/pom.xml b/onebusaway-enterprise-webapp/pom.xml index c7eb16e15..d01aa4f23 100644 --- a/onebusaway-enterprise-webapp/pom.xml +++ b/onebusaway-enterprise-webapp/pom.xml @@ -5,7 +5,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-enterprise-webapp war diff --git a/onebusaway-federations-webapp/pom.xml b/onebusaway-federations-webapp/pom.xml index 05fb75c98..756d76584 100644 --- a/onebusaway-federations-webapp/pom.xml +++ b/onebusaway-federations-webapp/pom.xml @@ -3,7 +3,7 @@ onebusaway-application-modules org.onebusaway - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-federations-webapp war diff --git a/onebusaway-federations/pom.xml b/onebusaway-federations/pom.xml index 03aadfca6..9683e1b82 100644 --- a/onebusaway-federations/pom.xml +++ b/onebusaway-federations/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-federations jar diff --git a/onebusaway-frontend-webapp/pom.xml b/onebusaway-frontend-webapp/pom.xml index d8adf1441..fb8a96a99 100644 --- a/onebusaway-frontend-webapp/pom.xml +++ b/onebusaway-frontend-webapp/pom.xml @@ -3,7 +3,7 @@ onebusaway-application-modules org.onebusaway - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT 4.0.0 diff --git a/onebusaway-geocoder/pom.xml b/onebusaway-geocoder/pom.xml index 6a2195fc5..d87e36ed8 100644 --- a/onebusaway-geocoder/pom.xml +++ b/onebusaway-geocoder/pom.xml @@ -3,7 +3,7 @@ onebusaway-application-modules org.onebusaway - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-geocoder diff --git a/onebusaway-geospatial/pom.xml b/onebusaway-geospatial/pom.xml index 92dc2715d..2fee1c73e 100644 --- a/onebusaway-geospatial/pom.xml +++ b/onebusaway-geospatial/pom.xml @@ -4,7 +4,7 @@ onebusaway-application-modules org.onebusaway - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-geospatial diff --git a/onebusaway-gtfs-hibernate-spring/pom.xml b/onebusaway-gtfs-hibernate-spring/pom.xml index 2817ac544..cb95701a5 100644 --- a/onebusaway-gtfs-hibernate-spring/pom.xml +++ b/onebusaway-gtfs-hibernate-spring/pom.xml @@ -6,7 +6,7 @@ onebusaway-application-modules org.onebusaway - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT diff --git a/onebusaway-gtfs-realtime-archiver/pom.xml b/onebusaway-gtfs-realtime-archiver/pom.xml index f772c95a2..e428e3d50 100644 --- a/onebusaway-gtfs-realtime-archiver/pom.xml +++ b/onebusaway-gtfs-realtime-archiver/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-gtfs-realtime-archiver war diff --git a/onebusaway-gtfs-realtime-model/pom.xml b/onebusaway-gtfs-realtime-model/pom.xml index 3f40f9137..54d348963 100644 --- a/onebusaway-gtfs-realtime-model/pom.xml +++ b/onebusaway-gtfs-realtime-model/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-gtfs-realtime-model onebusaway-gtfs-realtime-model @@ -37,7 +37,7 @@ org.onebusaway onebusaway-container - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT diff --git a/onebusaway-gtfsrt-integration-tests/pom.xml b/onebusaway-gtfsrt-integration-tests/pom.xml index 917cd724f..9feb3a8ec 100644 --- a/onebusaway-gtfsrt-integration-tests/pom.xml +++ b/onebusaway-gtfsrt-integration-tests/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-gtfsrt-integration-tests jar diff --git a/onebusaway-gwt-common/pom.xml b/onebusaway-gwt-common/pom.xml index 6159ab941..164bb739d 100644 --- a/onebusaway-gwt-common/pom.xml +++ b/onebusaway-gwt-common/pom.xml @@ -2,7 +2,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT 4.0.0 onebusaway-gwt-common diff --git a/onebusaway-nextbus-api-webapp/pom.xml b/onebusaway-nextbus-api-webapp/pom.xml index bf73b3ff0..51303c686 100644 --- a/onebusaway-nextbus-api-webapp/pom.xml +++ b/onebusaway-nextbus-api-webapp/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-nextbus-api-webapp war diff --git a/onebusaway-phone-webapp/pom.xml b/onebusaway-phone-webapp/pom.xml index 6f1c11755..08b3eb84f 100644 --- a/onebusaway-phone-webapp/pom.xml +++ b/onebusaway-phone-webapp/pom.xml @@ -4,7 +4,7 @@ onebusaway-application-modules org.onebusaway - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-phone-webapp war diff --git a/onebusaway-phone/pom.xml b/onebusaway-phone/pom.xml index c46ed311b..538e90339 100644 --- a/onebusaway-phone/pom.xml +++ b/onebusaway-phone/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-phone jar diff --git a/onebusaway-presentation/pom.xml b/onebusaway-presentation/pom.xml index 773812a6e..df06ec83b 100644 --- a/onebusaway-presentation/pom.xml +++ b/onebusaway-presentation/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-presentation jar diff --git a/onebusaway-quickstart/onebusaway-quickstart-assembly/pom.xml b/onebusaway-quickstart/onebusaway-quickstart-assembly/pom.xml index 323749269..0d8cfe3c4 100644 --- a/onebusaway-quickstart/onebusaway-quickstart-assembly/pom.xml +++ b/onebusaway-quickstart/onebusaway-quickstart-assembly/pom.xml @@ -3,7 +3,7 @@ onebusaway-quickstart org.onebusaway - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-quickstart-assembly pom diff --git a/onebusaway-quickstart/onebusaway-quickstart-bootstrap/pom.xml b/onebusaway-quickstart/onebusaway-quickstart-bootstrap/pom.xml index 8411ee3ab..fad05ed1e 100644 --- a/onebusaway-quickstart/onebusaway-quickstart-bootstrap/pom.xml +++ b/onebusaway-quickstart/onebusaway-quickstart-bootstrap/pom.xml @@ -3,7 +3,7 @@ onebusaway-quickstart org.onebusaway - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-quickstart-bootstrap onebusaway-quickstart-bootstrap diff --git a/onebusaway-quickstart/onebusaway-quickstart-common/pom.xml b/onebusaway-quickstart/onebusaway-quickstart-common/pom.xml index 254e6a0db..3d2cd388a 100644 --- a/onebusaway-quickstart/onebusaway-quickstart-common/pom.xml +++ b/onebusaway-quickstart/onebusaway-quickstart-common/pom.xml @@ -3,7 +3,7 @@ onebusaway-quickstart org.onebusaway - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-quickstart-common onebusaway-quickstart-common diff --git a/onebusaway-quickstart/onebusaway-quickstart-mains/pom.xml b/onebusaway-quickstart/onebusaway-quickstart-mains/pom.xml index 1df2a237a..d76dfe2e9 100644 --- a/onebusaway-quickstart/onebusaway-quickstart-mains/pom.xml +++ b/onebusaway-quickstart/onebusaway-quickstart-mains/pom.xml @@ -3,7 +3,7 @@ onebusaway-quickstart org.onebusaway - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-quickstart-mains onebusaway-quickstart-mains diff --git a/onebusaway-quickstart/onebusaway-quickstart-webapp/pom.xml b/onebusaway-quickstart/onebusaway-quickstart-webapp/pom.xml index 493371d47..2b25a8813 100644 --- a/onebusaway-quickstart/onebusaway-quickstart-webapp/pom.xml +++ b/onebusaway-quickstart/onebusaway-quickstart-webapp/pom.xml @@ -4,7 +4,7 @@ onebusaway-quickstart org.onebusaway - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-quickstart-webapp jar diff --git a/onebusaway-quickstart/pom.xml b/onebusaway-quickstart/pom.xml index 4b62a090f..cc2a3f7bf 100644 --- a/onebusaway-quickstart/pom.xml +++ b/onebusaway-quickstart/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-quickstart pom diff --git a/onebusaway-realtime-api/pom.xml b/onebusaway-realtime-api/pom.xml index 2fd4c8369..cc55aea84 100644 --- a/onebusaway-realtime-api/pom.xml +++ b/onebusaway-realtime-api/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-realtime-api jar diff --git a/onebusaway-sms-webapp/pom.xml b/onebusaway-sms-webapp/pom.xml index ef707ac86..6726c921f 100644 --- a/onebusaway-sms-webapp/pom.xml +++ b/onebusaway-sms-webapp/pom.xml @@ -5,7 +5,7 @@ onebusaway-application-modules org.onebusaway - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-sms-webapp diff --git a/onebusaway-transit-data-federation-builder/pom.xml b/onebusaway-transit-data-federation-builder/pom.xml index 011bd4df1..b11e90966 100644 --- a/onebusaway-transit-data-federation-builder/pom.xml +++ b/onebusaway-transit-data-federation-builder/pom.xml @@ -3,7 +3,7 @@ onebusaway-application-modules org.onebusaway - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-transit-data-federation-builder diff --git a/onebusaway-transit-data-federation-webapp/pom.xml b/onebusaway-transit-data-federation-webapp/pom.xml index 84f1a1d6b..f96d5c8a3 100644 --- a/onebusaway-transit-data-federation-webapp/pom.xml +++ b/onebusaway-transit-data-federation-webapp/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-transit-data-federation-webapp war diff --git a/onebusaway-transit-data-federation/pom.xml b/onebusaway-transit-data-federation/pom.xml index f9b1985c8..b26ec6c10 100644 --- a/onebusaway-transit-data-federation/pom.xml +++ b/onebusaway-transit-data-federation/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-transit-data-federation jar @@ -210,7 +210,7 @@ org.onebusaway onebusaway-api-core - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT compile diff --git a/onebusaway-transit-data/pom.xml b/onebusaway-transit-data/pom.xml index 216eb2219..a6cdf885c 100644 --- a/onebusaway-transit-data/pom.xml +++ b/onebusaway-transit-data/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-transit-data jar diff --git a/onebusaway-twilio-webapp/pom.xml b/onebusaway-twilio-webapp/pom.xml index 3bd41ab80..7377deab3 100644 --- a/onebusaway-twilio-webapp/pom.xml +++ b/onebusaway-twilio-webapp/pom.xml @@ -3,7 +3,7 @@ onebusaway-application-modules org.onebusaway - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-twilio-webapp war diff --git a/onebusaway-users/pom.xml b/onebusaway-users/pom.xml index f709e32c1..de0226b68 100644 --- a/onebusaway-users/pom.xml +++ b/onebusaway-users/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-users jar diff --git a/onebusaway-util/pom.xml b/onebusaway-util/pom.xml index 0c83dd9bb..f330c98a3 100644 --- a/onebusaway-util/pom.xml +++ b/onebusaway-util/pom.xml @@ -4,7 +4,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-util diff --git a/onebusaway-watchdog-webapp/pom.xml b/onebusaway-watchdog-webapp/pom.xml index 913fbe4aa..5aefc2d57 100644 --- a/onebusaway-watchdog-webapp/pom.xml +++ b/onebusaway-watchdog-webapp/pom.xml @@ -3,7 +3,7 @@ org.onebusaway onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT onebusaway-watchdog-webapp war diff --git a/pom.xml b/pom.xml index 0f776e373..a6c0f19d2 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 4.0.0 onebusaway-application-modules - 2.5.13-cs-SNAPSHOT + 2.5.13-security-SNAPSHOT pom onebusaway-application-modules From 7f29365df3173a4d699e3446f83ac403b374282a Mon Sep 17 00:00:00 2001 From: rjasmin-camsys Date: Mon, 29 Jul 2024 14:12:21 -0400 Subject: [PATCH 12/12] Fixing serialization issue with hibernate upgrade --- .../src/main/java/org/onebusaway/users/model/User.java | 3 ++- .../main/java/org/onebusaway/users/model/UserIndexKey.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/onebusaway-users/src/main/java/org/onebusaway/users/model/User.java b/onebusaway-users/src/main/java/org/onebusaway/users/model/User.java index 84f52e8ca..fc35b8a6d 100644 --- a/onebusaway-users/src/main/java/org/onebusaway/users/model/User.java +++ b/onebusaway-users/src/main/java/org/onebusaway/users/model/User.java @@ -103,10 +103,11 @@ public class User extends IdentityBean { private Date lastAccessTime; - @Column(columnDefinition = "BIT", length = 1) + @Column(length = 1) private boolean temporary; @Lob + @Column(columnDefinition = "blob") private UserProperties properties; @ManyToMany(fetch = FetchType.EAGER) diff --git a/onebusaway-users/src/main/java/org/onebusaway/users/model/UserIndexKey.java b/onebusaway-users/src/main/java/org/onebusaway/users/model/UserIndexKey.java index 0c64f4f9c..dc7669b9a 100644 --- a/onebusaway-users/src/main/java/org/onebusaway/users/model/UserIndexKey.java +++ b/onebusaway-users/src/main/java/org/onebusaway/users/model/UserIndexKey.java @@ -36,10 +36,10 @@ public class UserIndexKey implements Serializable, Comparable { private static final long serialVersionUID = 1L; - @Column(columnDefinition = "VARCHAR(50)") + @Column(length = 200) private String type; - @Column(columnDefinition = "VARCHAR(200)") + @Column(length = 200) private String value; public UserIndexKey() {