Merge branch 'master' into 'dev'

Master

See merge request ajg0702/ajqueue!7
This commit is contained in:
ajgeiss0702
2021-05-23 20:04:44 +00:00
2 changed files with 7 additions and 6 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
image: gradle:6.8.2-jdk8
image: gradle:6.8.2-jdk15
# Cache downloaded dependencies and plugins between builds.
# To keep cache across branches add 'key: "$CI_JOB_NAME"'
+6 -5
View File
@@ -3,7 +3,7 @@ plugins {
id("com.github.johnrengelman.shadow").version("6.1.0")
`maven-publish`
}
group = "us.ajg0702"
version = "1.9.4"
@@ -59,13 +59,14 @@ publishing {
maven {
url = uri(mavenUrl)
name = "Gitlab"
credentials(HttpHeaderCredentials::class.java) {
name = "GitLab"
credentials(HttpHeaderCredentials::class) {
name = "Job-Token"
value = System.getenv("CI_JOB_TOKEN")
value = "a"//System.getenv("CI_JOB_TOKEN")
}
authentication {
container(HttpHeaderAuthentication::class.java)
getCredentials(HttpHeaderCredentials::class)
}
}
}