Skip to content

Commit

Permalink
SHIBUI-2273
Browse files Browse the repository at this point in the history
update version of spring security
properties file cleanup
  • Loading branch information
chasegawa committed Jun 15, 2022
1 parent 70d7ecd commit f9e675b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
2 changes: 1 addition & 1 deletion backend/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spring.datasource.password=shibui

# Database Configuration H2
spring.datasource.url=jdbc:h2:mem:shibui;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
spring.datasource.platform=h2
spring.sql.init.platform=h2
spring.datasource.driverClassName=org.h2.Driver
spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
spring.h2.console.enabled=true
Expand Down
13 changes: 2 additions & 11 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ version=1.11.0-SNAPSHOT
### library versions ###
commonsCollections4Version=4.4
cryptacularVersion=1.2.4
#hibernateVersion=5.5.0.Final
hibernateVersion=5.6.9.Final
luceneVersion=8.1.1
log4JVersion=2.17.2
Expand All @@ -14,10 +13,8 @@ opensamlVersion=4.2.0
pac4JVersion=5.4.3
pac4jSpringSecurityVersion=7.0.3
shibbolethVersion=4.2.1
#springbootVersion=2.5.12
springbootVersion=2.7.0
springSecurityVersion=5.6.3
# springSecurityVersion=5.7.1
springSecurityVersion=5.7.1

### DB Driver Versions ###
mariadbVersion=3.0.4
Expand All @@ -35,10 +32,4 @@ i2.github.apiEndpoint=https://github.internet2.edu/api/v3

## NOTES
# pac4j spring security 7.0.3 here uses the pac4j 5.4.3 core, thus differences in versions (they used use the same versions, now
# keeping them in sync takes paying attention
#
# Springboot 2.7.0 and Hibernate 5.6.9 are current, but don't like all the columns named "value" in the db (along with H2), so don't
# update to these versions until ready to migrate the database columns. (the tests fail under these versions because the test database
# doesn't work).
#
# Additionally, springbootsecurity for tests doesn't like 5.7.1
# keeping them in sync takes paying attention

0 comments on commit f9e675b

Please sign in to comment.