Skip to content

Commit 39e0952

Browse files
authored
Revert "Set up flyway klass api (#283)" (#284)
This reverts commit cbadb48.
1 parent cbadb48 commit 39e0952

File tree

45 files changed

+590
-1201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+590
-1201
lines changed

klass-api/pom.xml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -79,20 +79,6 @@
7979
<artifactId>postgresql</artifactId>
8080
</dependency>
8181

82-
<!--Flyway-->
83-
<dependency>
84-
<groupId>org.flywaydb</groupId>
85-
<artifactId>flyway-database-postgresql</artifactId>
86-
<version>11.11.0</version>
87-
<scope>runtime</scope>
88-
</dependency>
89-
<dependency>
90-
<groupId>org.flywaydb</groupId>
91-
<artifactId>flyway-core</artifactId>
92-
<version>11.11.1</version>
93-
</dependency>
94-
95-
9682
<!--TOMCAT-->
9783
<dependency>
9884
<groupId>org.springframework.boot</groupId>
@@ -227,11 +213,6 @@
227213
<id>documentation</id>
228214
<build>
229215
<plugins>
230-
<plugin>
231-
<groupId>org.flywaydb</groupId>
232-
<artifactId>flyway-maven-plugin</artifactId>
233-
<version>11.11.0</version>
234-
</plugin>
235216
<plugin>
236217
<groupId>org.apache.maven.plugins</groupId>
237218
<artifactId>maven-surefire-plugin</artifactId>

klass-api/src/main/resources/application-h2-inmemory.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ spring.datasource.username=sa
55
spring.datasource.password=
66

77
spring.flyway.enabled=false
8+
#spring.flyway.locations=classpath:db/postgresql
89

910
spring.jpa.hibernate.ddl-auto=create-drop
1011
spring.jpa.show-sql=true
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
2+
spring.flyway.enabled=false
3+
#spring.flyway.locations=classpath:db/postgresql
24

35
spring.jpa.hibernate.ddl-auto=create-drop
46
spring.jpa.show-sql=true
57

6-
# Flyway
7-
spring.flyway.enabled=true
8-
spring.flyway.locations=classpath:db/migration/test
9-

klass-api/src/main/resources/application-postgres-local.properties

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,8 @@ spring.datasource.username=klass
44
spring.datasource.password=${POSTGRES_PASSWORD}
55
spring.datasource.driverclassName=org.postgresql.Driver
66
spring.jpa.hibernate.ddl-auto=none
7-
7+
spring.flyway.enabled=false
88
spring.datasource.hikari.connection-test-query=SELECT 1
99
spring.datasource.hikari.validation-timeout=3000
1010
spring.jpa.properties.hibernate.format_sql=true
1111
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
12-
13-
# Flyway
14-
spring.flyway.enabled=true
15-
spring.flyway.url=jdbc:postgresql://${POSTGRES_INSTANCE}:5432/klass
16-
spring.flyway.password=${POSTGRES_PASSWORD}
17-
spring.flyway.user=klass
18-
spring.flyway.locations=classpath:db/migration
19-
# This is for first time running on a database with data, but no flyway schema history table
20-
spring.flyway.baseline-on-migrate=true
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
# custom properties used when "postgres" Profile is used
22
spring.datasource.url=${NAIS_DATABASE_KLASS_KLASS_JDBC_URL}
33
spring.jpa.hibernate.ddl-auto=none
4+
spring.flyway.enabled=false
45
spring.datasource.hikari.connection-test-query=SELECT 1
56
spring.datasource.hikari.validation-timeout=3000
67
spring.datasource.hikari.maximum-pool-size=20
78
spring.datasource.hikari.leak-detection-threshold=20000
89
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
9-
10-
# Flyway
11-
spring.flyway.enabled=true
12-
spring.flyway.url=${NAIS_DATABASE_KLASS_KLASS_JDBC_URL}
13-
spring.flyway.password=${NAIS_DATABASE_KLASS_KLASS_PASSWORD}
14-
spring.flyway.user=${NAIS_DATABASE_KLASS_KLASS_USERNAME}
15-
spring.flyway.locations=classpath:db/migration
16-
# This is for first time running on a database with data, but no flyway schema history table
17-
spring.flyway.baseline-on-migrate=true

0 commit comments

Comments
 (0)