diff --git a/Jenkinsfile-online b/Jenkinsfile-online index af04f191..2d34d137 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -14,8 +14,8 @@ pipeline { GITHUB_CREDENTIAL_ID = 'github-id' KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' REGISTRY = 'docker.io' - DOCKERHUB_NAMESPACE = 'leifengyang' - GITHUB_ACCOUNT = 'leifengyang' + DOCKERHUB_NAMESPACE = 'xg810047429' + GITHUB_ACCOUNT = 'XGsimple' APP_NAME = 'devops-java-sample' SONAR_CREDENTIAL_ID = 'sonar-qube' } @@ -27,13 +27,6 @@ pipeline { } } - stage ('unit test') { - steps { - container ('maven') { - sh 'mvn clean -gs `pwd`/configuration/settings.xml test' - } - } - } stage('sonarqube analysis') { steps { diff --git a/configuration/settings.xml b/configuration/settings.xml index 9838b7c9..b9639d4b 100644 --- a/configuration/settings.xml +++ b/configuration/settings.xml @@ -35,9 +35,10 @@ - repo.jenkins-ci.org - https://repo.jenkins-ci.org/public/ - m.g.o-public + nexus-aliyun + central + Nexus aliyun + http://maven.aliyun.com/nexus/content/groups/public diff --git a/pom.xml b/pom.xml index fe09b5ff..bf36e267 100644 --- a/pom.xml +++ b/pom.xml @@ -1,31 +1,56 @@ - - 4.0.0 + + 4.0.0 - io.kubesphere.devops - devops-sample - 0.0.1-SNAPSHOT - devops-sample :: HelloWorld Demo + io.kubesphere.devops + devops-sample + 0.0.1-SNAPSHOT + devops-sample :: HelloWorld Demo - - UTF-8 - UTF-8 + + 1.8 + UTF-8 + UTF-8 - - + - ${PWD}/./target/jacoco.exec - target/classes - + ${PWD}/./target/jacoco.exec + target/classes + - - - org.springframework.boot - spring-boot-starter-parent - 2.1.13.RELEASE - + + + org.springframework.boot + spring-boot-starter-parent + 2.1.11.RELEASE + + + + + spring + https://maven.aliyun.com/repository/spring + + true + + + true + + + + + + spring + https://maven.aliyun.com/repository/spring + + true + + + true + + + @@ -35,39 +60,47 @@ junit junit - 4.12 + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + 1.8 + 1.8 + + org.jacoco jacoco-maven-plugin 0.8.2 - true + true - - agent-for-ut - - prepare-agent - - - - agent-for-it - - prepare-agent-integration - - - - jacoco-site - verify - - report - - + + agent-for-ut + + prepare-agent + + + + agent-for-it + + prepare-agent-integration + + + + jacoco-site + verify + + report + + @@ -80,7 +113,7 @@ org.sonarsource.scanner.maven sonar-maven-plugin - 3.6.0.1398 + 3.7.0.1746