Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Security fixes dependabot #162

Open
wants to merge 12 commits into
base: unified
Choose a base branch
from
Open

Security fixes dependabot #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2569db1
changing to spring.security.version 5.4.11
rjasmin-camsys Jul 24, 2024
46f9581
changing to org.apache.struts 2.5.33
rjasmin-camsys Jul 24, 2024
9a6bc51
changing org.hsqldb to 2.7.1
rjasmin-camsys Jul 24, 2024
772306c
changing spring.security.version to 5.7.12
rjasmin-camsys Jul 24, 2024
7d8e966
changing org.apache.commons to 1.26.0
rjasmin-camsys Jul 24, 2024
a3954a2
changing com.google.code.gson to 2.8.9
rjasmin-camsys Jul 25, 2024
85e3989
changing com.thoughtworks.xstream to 1.4.20
rjasmin-camsys Jul 26, 2024
c0fa905
changing org.jsoup to 1.14.2, also slight change to VehicleBlockAssig…
rjasmin-camsys Jul 26, 2024
14694fb
changing org.mybatis to 3.5.6
rjasmin-camsys Jul 26, 2024
ec2ef93
changing commons-collections to 3.2.2
rjasmin-camsys Jul 26, 2024
5b38a22
changing version to reflect security testing
sheldonabrown Jul 26, 2024
7f29365
Fixing serialization issue with hibernate upgrade
rjasmin-camsys Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions onebusaway-admin-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-admin-webapp</artifactId>
<packaging>war</packaging>
Expand All @@ -13,7 +13,7 @@
<xwiki.version>2.3.1</xwiki.version>
<xwiki.integration.version>1.0.1</xwiki.integration.version>
<geotools.version>20.5</geotools.version>
<spring.security.version>5.3.2.RELEASE</spring.security.version>
<spring.security.version>5.7.12</spring.security.version>
<bundle.builtPath>/var/lib/oba/bundles/builder</bundle.builtPath>
<bundle.stagedPath>/var/lib/oba/bundles/staged</bundle.stagedPath>
<bundle.deployPath>/var/lib/oba/bundles/active</bundle.deployPath>
Expand Down Expand Up @@ -310,7 +310,7 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.10.1</version>
<version>1.14.2</version>
</dependency>

<!-- for maps -->
Expand Down
3 changes: 1 addition & 2 deletions .../onebusaway/webapp/actions/admin/vehicleblockassignment/VehicleBlockAssignmentAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-agency-metadata/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-agency-metadata</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-alerts-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>onebusaway-application-modules</artifactId>
<groupId>org.onebusaway</groupId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
6 changes: 3 additions & 3 deletions onebusaway-alerts-persistence/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>

<artifactId>onebusaway-alerts-persistence</artifactId>
Expand Down Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.1</version>
<version>2.8.9</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
Expand Down Expand Up @@ -73,7 +73,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.18</version>
<version>1.26.0</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-api-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-api-core</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion onebusaway-api-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-api-webapp</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-combined-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-combined-webapp</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-container/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-container</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-core</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-enterprise-acta-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>onebusaway-application-modules</artifactId>
<groupId>org.onebusaway</groupId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-enterprise-acta-webapp</artifactId>
<packaging>war</packaging>
Expand Down
4 changes: 2 additions & 2 deletions onebusaway-enterprise-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-enterprise-webapp</artifactId>
<packaging>war</packaging>
Expand Down Expand Up @@ -120,7 +120,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>1.7.1</version>
<version>2.8.9</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-federations-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>onebusaway-application-modules</artifactId>
<groupId>org.onebusaway</groupId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-federations-webapp</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-federations/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-federations</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-frontend-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>onebusaway-application-modules</artifactId>
<groupId>org.onebusaway</groupId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion onebusaway-geocoder/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>onebusaway-application-modules</artifactId>
<groupId>org.onebusaway</groupId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-geocoder</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion onebusaway-geospatial/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>onebusaway-application-modules</artifactId>
<groupId>org.onebusaway</groupId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-geospatial</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion onebusaway-gtfs-hibernate-spring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>onebusaway-application-modules</artifactId>
<groupId>org.onebusaway</groupId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-gtfs-realtime-archiver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-gtfs-realtime-archiver</artifactId>
<packaging>war</packaging>
Expand Down
4 changes: 2 additions & 2 deletions onebusaway-gtfs-realtime-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-gtfs-realtime-model</artifactId>
<name>onebusaway-gtfs-realtime-model</name>
Expand Down Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-container</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions onebusaway-gtfsrt-integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-gtfsrt-integration-tests</artifactId>
<packaging>jar</packaging>
Expand Down Expand Up @@ -98,7 +98,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>1.7.1</version>
<version>2.8.9</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-gwt-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>onebusaway-gwt-common</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions onebusaway-nextbus-api-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-nextbus-api-webapp</artifactId>
<packaging>war</packaging>
Expand Down Expand Up @@ -178,7 +178,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.3.1</version>
<version>2.8.9</version>
</dependency>
<dependency>
<groupId>org.onebusaway.util</groupId>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-phone-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>onebusaway-application-modules</artifactId>
<groupId>org.onebusaway</groupId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-phone-webapp</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-phone/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-phone</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-presentation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-presentation</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-quickstart/onebusaway-quickstart-assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>onebusaway-quickstart</artifactId>
<groupId>org.onebusaway</groupId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-quickstart-assembly</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-quickstart/onebusaway-quickstart-bootstrap/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>onebusaway-quickstart</artifactId>
<groupId>org.onebusaway</groupId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-quickstart-bootstrap</artifactId>
<name>onebusaway-quickstart-bootstrap</name>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-quickstart/onebusaway-quickstart-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>onebusaway-quickstart</artifactId>
<groupId>org.onebusaway</groupId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-quickstart-common</artifactId>
<name>onebusaway-quickstart-common</name>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-quickstart/onebusaway-quickstart-mains/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>onebusaway-quickstart</artifactId>
<groupId>org.onebusaway</groupId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-quickstart-mains</artifactId>
<name>onebusaway-quickstart-mains</name>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-quickstart/onebusaway-quickstart-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>onebusaway-quickstart</artifactId>
<groupId>org.onebusaway</groupId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-quickstart-webapp</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-quickstart/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-quickstart</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-realtime-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-application-modules</artifactId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>
<artifactId>onebusaway-realtime-api</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-sms-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>onebusaway-application-modules</artifactId>
<groupId>org.onebusaway</groupId>
<version>2.5.13-cs-SNAPSHOT</version>
<version>2.5.13-security-SNAPSHOT</version>
</parent>

<artifactId>onebusaway-sms-webapp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion onebusaway-status-agent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>3.4.6</version>
<version>3.5.6</version>
</dependency>

</dependencies>
Expand Down
Loading