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.

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

feat: update dependencies #116

Merged
merged 4 commits into from
Mar 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 26 additions & 18 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
import org.flywaydb.gradle.task.FlywayMigrateTask

buildscript {
dependencies {
classpath("org.flywaydb:flyway-database-postgresql:10.10.0")
}
}

plugins {
id 'java'
id 'application'
id 'idea'
id 'org.flywaydb.flyway' version "8.0.0"
id 'org.flywaydb.flyway' version "10.0.0"
}

group 'telraam'
version '1.0-SNAPSHOT'

sourceCompatibility = 16
sourceCompatibility = 17

// Set our project variables
project.ext {
dropwizardVersion = '2.0.25'
dropwizardVersion = '4.0.5'
}

repositories {
Expand All @@ -24,15 +30,15 @@ application {
mainClass.set('telraam.App')
}

task runDev {
tasks.register('runDev') {

finalizedBy {
run.environment("CONFIG_KEY", "DEVELOPMENT")
run.args('server', "$rootProject.projectDir/src/main/resources/telraam/devConfig.yml")
run
}
}
task runProd {
tasks.register('runProd') {

finalizedBy {
run.environment("CONFIG_KEY", "PRODUCTION")
Expand All @@ -45,7 +51,9 @@ idea {
inheritOutputDirs = true
}
}
build.finalizedBy(javadoc)
build {
finalizedBy(javadoc)
}

dependencies {
// Web framework stuff
Expand All @@ -56,24 +64,24 @@ dependencies {
'io.dropwizard:dropwizard-jdbi3:' + dropwizardVersion,
)
// Database
implementation('com.h2database:h2:1.4.200')
implementation('org.postgresql:postgresql:42.2.24.jre7')
implementation('com.h2database:h2:2.2.220')
implementation('org.postgresql:postgresql:42.7.3')

// Testing
testImplementation('org.junit.jupiter:junit-jupiter:5.8.1')
testImplementation('org.flywaydb:flyway-core:7.14.1')
testImplementation('org.mockito:mockito-core:3.12.4')
testImplementation('org.junit.jupiter:junit-jupiter:5.10.2')
testImplementation('org.flywaydb:flyway-core:10.10.0')
testImplementation('org.mockito:mockito-core:5.11.0')
testImplementation("io.dropwizard:dropwizard-testing:" + dropwizardVersion)

// Statistics for Viterbi-lapper
implementation("org.apache.commons:commons-math3:3.0")
implementation("org.apache.commons:commons-math3:3.6.1")

// JAX-B dependencies for JDK 9+ -> https://stackoverflow.com/a/43574427
implementation 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359'
implementation 'org.glassfish.jaxb:jaxb-runtime:3.0.1'
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
implementation 'org.glassfish.jaxb:jaxb-runtime:4.0.5'

// Swagger-UI
implementation 'com.smoketurner:dropwizard-swagger:2.0.0-1'
implementation('com.smoketurner:dropwizard-swagger:4.0.5-1')

// Getter & Setter via annotations
compileOnly 'org.projectlombok:lombok:1.18.32'
Expand All @@ -95,15 +103,15 @@ def prodProps = new Properties()
file("$rootProject.projectDir/src/main/resources/telraam/prodConfig.properties").withInputStream {
prodProps.load(it)
}
task migrateProductionDatabase(type: FlywayMigrateTask) {
tasks.register('migrateProductionDatabase', FlywayMigrateTask) {
url = prodProps.getProperty("DB_URL")
}

def devProps = new Properties()
file("$rootProject.projectDir/src/main/resources/telraam/devConfig.properties").withInputStream {
devProps.load(it)
}
task migrateDevelopmentDatabase(type: FlywayMigrateTask) {
tasks.register('migrateDevelopmentDatabase', FlywayMigrateTask) {
url = devProps.getProperty("DB_URL")
user = devProps.getProperty("DB_USER")
password = devProps.getProperty("DB_PASSWORD")
Expand All @@ -113,7 +121,7 @@ def testProps = new Properties()
file("$rootProject.projectDir/src/test/resources/telraam/testConfig.properties").withInputStream {
testProps.load(it)
}
task migrateTestingDatabase(type: FlywayMigrateTask) {
tasks.register('migrateTestingDatabase', FlywayMigrateTask) {
url = testProps.getProperty("DB_URL")
baselineOnMigrate = true
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading