diff --git a/Jenkinsfile b/Jenkinsfile index 0a9cdd7..b28a148 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,6 +10,8 @@ properties([ ]) ]) +def javaVersion = '17' + node('linux-amd64') { stage ('Prepare') { deleteDir() @@ -17,7 +19,7 @@ node('linux-amd64') { } stage ('Build') { - infra.runMaven(["clean", "verify"], '11') + infra.runMaven(["clean", "verify"], javaVersion) } stage ('Generate') { @@ -25,14 +27,7 @@ node('linux-amd64') { // tmp folder, and set MAVEN_SETTINGS env var to its absolute // location infra.withArtifactCachingProxy { - repositoryOrigin = "https://repo." + (env.ARTIFACT_CACHING_PROXY_PROVIDER ?: 'azure') + ".jenkins.io" - withEnv(["ARTIFACT_CACHING_PROXY_ORIGIN=$repositoryOrigin"]) { - withCredentials([usernamePassword(credentialsId: 'artifact-caching-proxy-credentials', - usernameVariable: 'ARTIFACT_CACHING_PROXY_USERNAME', - passwordVariable: 'ARTIFACT_CACHING_PROXY_PASSWORD')]) { - infra.runWithMaven('java -jar target/extension-indexer-*-bin/extension-indexer-*.jar -adoc dist', '11') - } - } + infra.runWithMaven('java -jar target/extension-indexer-*-bin/extension-indexer-*.jar -adoc dist', javaVersion) } } diff --git a/maven-settings.xml b/maven-settings.xml index bc58a94..0bda067 100644 --- a/maven-settings.xml +++ b/maven-settings.xml @@ -1,9 +1,40 @@ + + jenkins + + + + jenkins + + + jenkins-public + https://repo.jenkins-ci.org/public/ + + true + + + + + + jenkins-public + https://repo.jenkins-ci.org/public/ + + true + + + + + - repo.jenkins-ci.org - https://repo.jenkins-ci.org/public/ - * + repo.j.o-mirror + repo.jenkins-ci.org + https://repo.jenkine-ci.org/public/ + + + m.g.o-public-repo1 + m.g.o-public + https://repo.maven.apache.org/maven2/