diff --git a/README.md b/README.md index e7d5651a..15f0d60d 100644 --- a/README.md +++ b/README.md @@ -30,43 +30,6 @@ This the high level flow for the application ``` ## Getting started -### Getting github-package-registry packages NAV-IT -Some packages used in this repo is uploaded to the GitHub Package Registry which requires authentication. It can, for example, be solved like this in Gradle: -``` -val githubUser: String by project -val githubPassword: String by project -repositories { - maven { - credentials { - username = githubUser - password = githubPassword - } - setUrl("https://maven.pkg.github.com/navikt/syfosm") - } -} -``` - -`githubUser` and `githubPassword` can be put into a separate file `~/.gradle/gradle.properties` with the following content: - -``` -githubUser=x-access-token -githubPassword=[token] -``` - -Replace `[token]` with a personal access token with scope `read:packages`. -See githubs guide [creating-a-personal-access-token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token) on -how to create a personal access token. - -Alternatively, the variables can be configured via environment variables: - -* `ORG_GRADLE_PROJECT_githubUser` -* `ORG_GRADLE_PROJECT_githubPassword` - -or the command line: - -``` bash -./gradlew -PgithubUser=x-access-token -PgithubPassword=[token] -``` #### Running locally ``` bash ./gradlew run diff --git a/build.gradle.kts b/build.gradle.kts index 463b3ce3..3b7805b9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ val ktorVersion = "2.3.4" val logbackVersion = "1.4.11" val logstashEncoderVersion = "7.4" val prometheusVersion = "0.16.0" -val smCommonVersion = "1.0.14" +val smCommonVersion = "2.0.0" val kotestVersion = "5.7.2" val mockkVersion = "1.13.7" val kotlinVersion = "1.9.10" @@ -33,17 +33,12 @@ application { applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment") } -val githubUser: String by project -val githubPassword: String by project + repositories { mavenCentral() maven { - url = uri("https://maven.pkg.github.com/navikt/syfosm-common") - credentials { - username = githubUser - password = githubPassword - } + url = uri("https://github-package-registry-mirror.gc.nav.no/cached/maven-release") } } @@ -65,8 +60,11 @@ dependencies { implementation("io.ktor:ktor-serialization-jackson:$ktorVersion") implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion") implementation("io.ktor:ktor-client-apache:$ktorVersion") - // override transient version 1.10 from io.ktor:ktor-client-apache - implementation("commons-codec:commons-codec:$commonsCodecVersion") + constraints { + implementation("commons-codec:commons-codec:$commonsCodecVersion") { + because("override transient from io.ktor:ktor-client-apache") + } + } implementation("no.nav.helse:syfosm-common-models:$smCommonVersion") implementation("no.nav.helse:syfosm-common-networking:$smCommonVersion") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 033e24c4..7f93135c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradlew b/gradlew index fcb6fca1..0adc8e1a 100755 --- a/gradlew +++ b/gradlew @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum