Merge branch 'master' of https://github.com/plexusorg/plex into taah-cmd-blocker

This commit is contained in:
Taah 2022-04-10 15:30:23 -07:00
commit 90ef0a2121
2 changed files with 3 additions and 2 deletions

2
Jenkinsfile vendored
View File

@ -23,7 +23,7 @@ pipeline {
} }
post { post {
always { always {
archiveArtifacts artifacts: "build/libs/*.jar", fingerprint: true archiveArtifacts artifacts: "build/libs/Plex.jar", fingerprint: true
javadoc javadocDir: "build/docs/javadoc", keepAll: false javadoc javadocDir: "build/docs/javadoc", keepAll: false
discordSend description: "**Build:** ${env.BUILD_NUMBER}\n**Status:** ${currentBuild.currentResult}", enableArtifactsList: true, footer: "Built with Jenkins", link: env.BUILD_URL, result: currentBuild.currentResult, scmWebUrl: "https://github.com/plexusorg/Plex", showChangeset: true, title: env.JOB_NAME, webhookURL: env.PLEX_WEBHOOK_URL discordSend description: "**Build:** ${env.BUILD_NUMBER}\n**Status:** ${currentBuild.currentResult}", enableArtifactsList: true, footer: "Built with Jenkins", link: env.BUILD_URL, result: currentBuild.currentResult, scmWebUrl: "https://github.com/plexusorg/Plex", showChangeset: true, title: env.JOB_NAME, webhookURL: env.PLEX_WEBHOOK_URL
cleanWs() cleanWs()

View File

@ -52,14 +52,15 @@ version = "1.0.1-SNAPSHOT"
description = "Plex" description = "Plex"
shadowJar { shadowJar {
archiveClassifier.set("")
archiveBaseName.set("Plex") archiveBaseName.set("Plex")
archiveClassifier.set("")
archiveVersion.set("") archiveVersion.set("")
relocate "org.bstats", "dev.plex" relocate "org.bstats", "dev.plex"
} }
tasks.jar { tasks.jar {
archiveBaseName.set("Plex") archiveBaseName.set("Plex")
archiveClassifier.set("notshaded")
archiveVersion.set("") archiveVersion.set("")
} }