Skip to content

Commit

Permalink
Feature/dpo 2108 hibernate (#114)
Browse files Browse the repository at this point in the history
* DPO-2108 upgrade spring boot

* DPO-2108 upgrade spring-cloud

* DPO-2108 version upgrades and degrades

* DPO-2108 upgrade setup-java, remove deprecated dialect setting

* DPO-2108 remove old comments
  • Loading branch information
teijosol authored Feb 21, 2024
1 parent 7782d98 commit 7d51dff
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup dependencies
run: cp -R digitraffic-build-dependencies/jms/ ~/.m2/
- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: corretto
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Setup dependencies
run: cp -R digitraffic-build-dependencies/jms/ ~/.m2/
- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: corretto
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
- name: Setup dependencies
run: cp -R digitraffic-build-dependencies/jms/ ~/.m2/
- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: corretto
Expand Down
16 changes: 6 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<!-- check hibernate-core dependency when updating! -->
<version>3.1.8</version>
<relativePath/>
</parent>
Expand All @@ -24,7 +23,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>17</java.version>
<maven.compiler.release>17</maven.compiler.release>
<com.google.protobuf.version>3.25.2</com.google.protobuf.version>
<com.google.protobuf.version>3.25.3</com.google.protobuf.version>
<org.apache.cxf.version>4.0.3</org.apache.cxf.version>
<org.glassfish.metro.ws.version>4.0.3</org.glassfish.metro.ws.version>
<spring.cloud.version>4.0.5</spring.cloud.version>
Expand Down Expand Up @@ -72,13 +71,10 @@
</repositories>

<dependencies>
<!-- remove this when spring boot is updated to use this! -->
<dependency><groupId>org.hibernate.orm</groupId><artifactId>hibernate-core</artifactId><version>6.3.1.Final</version></dependency>

<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
<version>${spring.cloud.version}</version>
<version>4.0.5</version>
</dependency>

<dependency>
Expand All @@ -96,7 +92,7 @@
<dependency>
<groupId>com.amazonaws.secretsmanager</groupId>
<artifactId>aws-secretsmanager-jdbc</artifactId>
<version>2.0.1</version>
<version>2.0.2</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -334,14 +330,14 @@
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-spatial</artifactId>
<version>6.4.3.Final</version>
<version>6.4.4.Final</version>
</dependency>

<!-- json column type -->
<dependency>
<groupId>io.hypersistence</groupId>
<artifactId>hypersistence-utils-hibernate-63</artifactId>
<version>3.7.1</version>
<version>3.7.3</version>
</dependency>

<!-- Library to transform GeoJSON <-> jts Geometry.
Expand All @@ -367,7 +363,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>1.12.651</version>
<version>1.12.661</version>
</dependency>

<dependency>
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true

# Default transaction timeout in seconds.
spring.transaction.default-timeout=600
spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
# OSIV is enabled by default. Disable it.
spring.jpa.open-in-view=false

Expand Down

0 comments on commit 7d51dff

Please sign in to comment.