Skip to content

Commit

Permalink
Upgraded out of date tooling and dependencies.
Browse files Browse the repository at this point in the history
Upgraded to Gradle 7.5.1
Upgraded Jib version
Remove jcenter
Upgraded ospackage plugin
Bumped Java dependencies
  • Loading branch information
Jon Haddad committed Sep 13, 2022
1 parent 5aca1a7 commit 73b1aed
Show file tree
Hide file tree
Showing 6 changed files with 200 additions and 164 deletions.
61 changes: 28 additions & 33 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
buildscript {
ext.kotlin_version = '1.3.50'

repositories {
mavenCentral()
jcenter()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.netflix.nebula:gradle-ospackage-plugin:6.2.1"
classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0'
}
}

plugins {
id 'com.google.cloud.tools.jib' version '1.8.0'
id 'com.google.cloud.tools.jib' version '3.3.0'
id "nebula.ospackage" version "9.1.1"
id "org.jetbrains.kotlin.jvm" version "1.7.10"
}

apply plugin: 'idea'
apply plugin: 'java'
apply plugin: 'kotlin'
apply plugin: 'application'
apply plugin: "nebula.ospackage"
apply plugin: 'nebula.ospackage-application'
Expand All @@ -39,59 +35,58 @@ repositories {
}

dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
compile group: 'com.beust', name: 'jcommander', version: '1.72'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10"
implementation group: 'com.beust', name: 'jcommander', version: '1.82'

// https://mvnrepository.com/artifact/org.apache.commons/commons-text
compile group: 'org.apache.commons', name: 'commons-text', version: '1.3'
implementation group: 'org.apache.commons', name: 'commons-text', version: '1.3'

// https://mvnrepository.com/artifact/com.datastax.cassandra/cassandra-driver-core
compile group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.6.0'
compile "com.fasterxml.jackson.module:jackson-module-kotlin:2.9.+"
implementation group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.11.2'
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.13.4'

// https://mvnrepository.com/artifact/org.reflections/reflections
compile group: 'org.reflections', name: 'reflections', version: '0.9.11'
implementation group: 'org.reflections', name: 'reflections', version: '0.9.11'

compile group: "org.apache.logging.log4j", name: "log4j-api", version: "2.17.1"
compile group: "org.apache.logging.log4j", name: "log4j-core", version:"2.17.1"
compile "org.apache.logging.log4j:log4j-api-kotlin:1.0.0"
implementation group: "org.apache.logging.log4j", name: "log4j-api", version: "2.17.1"
implementation group: "org.apache.logging.log4j", name: "log4j-core", version:"2.17.1"
implementation 'org.apache.logging.log4j:log4j-api-kotlin:1.2.0'
// https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j18-impl
// maps the datastax driver slf4j calls to log4j

compile 'org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0'
implementation 'org.apache.logging.log4j:log4j-slf4j18-impl:2.18.0'

// needed for yaml logging configurations

compile 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.8'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.4'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.4'

// https://mvnrepository.com/artifact/io.dropwizard.metrics/metrics-core
// need to use the same version as datastax driver
compile group: 'io.dropwizard.metrics', name: 'metrics-core', version: '3.2.2'
implementation group: 'io.dropwizard.metrics', name: 'metrics-core', version: '3.2.2'

// https://mvnrepository.com/artifact/com.google.guava/guava
compile group: 'com.google.guava', name: 'guava', version: '19.0'
implementation group: 'com.google.guava', name: 'guava', version: '31.1-jre'

// https://mvnrepository.com/artifact/com.github.ajalt/mordant
compile group: 'com.github.ajalt', name: 'mordant', version: '1.1.0'
implementation group: 'com.github.ajalt', name: 'mordant', version: '1.1.0'

compile 'io.prometheus:simpleclient:0.6.0'
compile 'io.prometheus:simpleclient_dropwizard:0.6.0'
compile 'io.prometheus:simpleclient_httpserver:0.6.0'
implementation 'io.prometheus:simpleclient:0.16.0'
implementation 'io.prometheus:simpleclient_dropwizard:0.16.0'
implementation 'io.prometheus:simpleclient_httpserver:0.16.0'

compile group: 'me.tongfei', name: 'progressbar', version: '0.7.2'
implementation group: 'me.tongfei', name: 'progressbar', version: '0.7.2'

compile 'org.apache.commons:commons-math3:3.6.1'
implementation 'org.apache.commons:commons-math3:3.6.1'

// exporting dropwizard metrics

testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.1.0'
testCompile group: 'org.assertj', name: 'assertj-core', version: '3.9.1'
testCompile "org.jetbrains.kotlin:kotlin-test"
testCompile "org.jetbrains.kotlin:kotlin-test-junit"
testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.4.0'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.1.0'
testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.9.1'
testImplementation "org.jetbrains.kotlin:kotlin-test-junit"
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.4.0'

testCompile "io.mockk:mockk:1.9.3"
testImplementation 'io.mockk:mockk:1.12.7'

}

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Fri Jul 19 14:29:50 PDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
Loading

0 comments on commit 73b1aed

Please sign in to comment.