diff --git a/Jenkinsfile b/Jenkinsfile
index 6b90558..be4985e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,7 +10,7 @@ build('swag-anapi-v2', 'docker-host') {
def gitUtils
runStage('load pipeline') {
env.JENKINS_LIB = "build_utils/jenkins_lib"
- pipeDefault = load("${env.JENKINS_LIB}/pipeJavaLibInsideDocker.groovy")
+ pipeDefault = load("${env.JENKINS_LIB}/pipeDefault.groovy")
withWsCache = load("${env.JENKINS_LIB}/withWsCache.groovy")
gitUtils = load("${env.JENKINS_LIB}/gitUtils.groovy")
}
@@ -33,6 +33,7 @@ build('swag-anapi-v2', 'docker-host') {
// Java
runStage('build java client & server') {
+ env.JAVA_HOME = sh(returnStdout: true, script: 'java-config --select-vm openjdk-bin-11 --jdk-home').trim()
withCredentials([[$class: 'FileBinding', credentialsId: 'java-maven-settings.xml', variable: 'SETTINGS_XML']]) {
if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME.startsWith('epic/')) {
sh 'make SETTINGS_XML=${SETTINGS_XML} BRANCH_NAME=${BRANCH_NAME} REPO_PUBLIC=${REPO_PUBLIC} java.openapi.deploy_client'
diff --git a/Makefile b/Makefile
index 228f987..0840a7a 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ MVN = mvn -s $(SETTINGS_XML) -Dcommit.number="$(NUMBER_COMMITS)"
java.openapi.compile_client: java.settings
$(MVN) clean && \
- $(MVN) compile -P="client"
+ $(MVN) compile -P="client" -P="$(REPO_PROFILE)"
java.openapi.deploy_client: java.settings
$(MVN) clean && \
@@ -66,11 +66,11 @@ java.openapi.deploy_client: java.settings
java.openapi.install_client: java.settings
$(MVN) clean && \
$(MVN) versions:set versions:commit -DnewVersion="$(JAVA_PKG_VERSION)-client" && \
- $(MVN) install -P="client"
+ $(MVN) install -P="client" -P="$(REPO_PROFILE)"
java.openapi.compile_server: java.settings
$(MVN) clean && \
- $(MVN) compile -P="server"
+ $(MVN) compile -P="server" -P="$(REPO_PROFILE)"
java.openapi.deploy_server: java.settings
$(MVN) clean && \
@@ -80,7 +80,7 @@ java.openapi.deploy_server: java.settings
java.openapi.install_server: java.settings
$(MVN) clean && \
$(MVN) versions:set versions:commit -DnewVersion="$(JAVA_PKG_VERSION)-server" && \
- $(MVN) install -P="server"
+ $(MVN) install -P="server" -P="$(REPO_PROFILE)"
java.compile: java.settings
$(MVN) compile
diff --git a/build_utils b/build_utils
index c12c9dd..be44d69 160000
--- a/build_utils
+++ b/build_utils
@@ -1 +1 @@
-Subproject commit c12c9dd296912ec3c34ad443b448df98fef2556a
+Subproject commit be44d69fc87b22a0bb82d98d6eae7658d1647f98
diff --git a/pom.xml b/pom.xml
index 817a6cc..f9ea15d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,11 +7,11 @@
com.rbkmoney
library-parent-pom
- 1.0.7
+ 1.0.8
swag-anapi-v2
- 1.0.0-SNAPSHOT
+ 1.0.0
jar
anapi v2
@@ -22,7 +22,7 @@
com.rbkmoney.openapi.anapi_v2
UTF-8
1.0.0
- 8
+ 11
${java.version}
${java.version}
1.7.21