locusworks/commons
4
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Compare commits

base: locusworks:release/1.0
Branches Tags
locusworks:develop locusworks:upgrade-jdk17 locusworks:master locusworks:release/1.1 locusworks:release/1.0
locusworks:1.1-RELEASE
...
compare: locusworks:1.1-RELEASE
Branches Tags
locusworks:upgrade-jdk17 locusworks:master locusworks:release/1.1 locusworks:develop locusworks:release/1.0
locusworks:1.1-RELEASE

4 Commits
release/1. ... 1.1-RELEAS

Author SHA1 Message Date
Isaac Parenteau
3e985f77d6 Merge pull request 'Fixed issue with flyway migration' (#2) from develop into master
All checks were successful
Locusworks Team/commons/pipeline/head This commit looks good
Details 
Reviewed-on: #2
 2021-09-14 22:09:36 -05:00
Isaac Parenteau
09f3bbbc74 Fixed issue with flyway migration
All checks were successful
Locusworks Team/commons/pipeline/head This commit looks good
Details
2021-09-14 22:00:15 -05:00
Isaac Parenteau
15429f0467 Merge pull request 'updated libraries' (#1) from develop into master
Some checks failed
Locusworks Team/commons/pipeline/head There was a failure building this commit
Details 
Reviewed-on: #1
 2021-09-14 21:52:58 -05:00
Isaac Parenteau
ea42a8b36d updated libraries
Some checks failed
Locusworks Team/commons/pipeline/head There was a failure building this commit
Details
2021-09-14 21:48:23 -05:00
2 changed files with 17 additions and 13 deletions
Expand all files Collapse all files

28
pom.xml
View File

@ -18,9 +18,9 @@
</scm>
<properties>
<log4j.version>2.12.0</log4j.version>
<slf4j.version>1.7.26</slf4j.version>
<jackson.version>2.9.9</jackson.version>
<log4j.version>2.14.1</log4j.version>
<slf4j.version>1.7.32</slf4j.version>
<jackson.version>2.12.5</jackson.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<nexus.repo>https://nexus.locusworks.net</nexus.repo>
@ -31,7 +31,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.20.1</version>
<version>3.0.0-M5</version>
<configuration>
<forkMode>always</forkMode>
</configuration>
@ -39,16 +39,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<version>3.8.1</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<failOnError>true</failOnError>
<compilerArgs>
<arg>-Xlint:all</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>5.1.0</version>
<version>6.3.1</version>
<executions>
<execution>
<goals>
@ -64,13 +68,13 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
<version>5.1.4</version>
<version>7.15.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@ -101,12 +105,12 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.5</version>
<version>4.5.13</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.5.5</version>
<version>4.5.13</version>
</dependency>
<!-- Jackson -->
@ -123,13 +127,13 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.9.1</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.5</version>
<version>2.8.8</version>
</dependency>
</dependencies>

2
src/main/java/net/locusworks/common/migration/MigrationItem.java
View File

@ -25,7 +25,7 @@ public class MigrationItem {
}
public String[] getSchemas() {
return flyway.getSchemas();
return flyway.getConfiguration().getSchemas();
}
public int qtyPending() {