valitydev/swag-anapi-v2
14
0
Fork 0
mirror of https://github.com/valitydev/swag-anapi-v2.git synced 2024-11-06 09:15:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6 from rbkmoney/epic/test-deploy

Browse Source 
Parent pom replaced
This commit is contained in:
Egor Cherniak 2021-09-22 13:50:52 +03:00 committed by GitHub
commit 044d359bc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Jenkinsfile vendored
View File

@ -33,10 +33,13 @@ build('swag-anapi-v2', 'docker-host') {
// Java
runStage('build java client & server') {
withCredentials([[$class: 'FileBinding', credentialsId: 'java-maven-settings.xml', variable: 'SETTINGS_XML']]) {
env.JAVA_HOME = sh(returnStdout: true, script: 'java-config --select-vm openjdk-bin-11 --jdk-home').trim()
withMaven() {
if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME.startsWith('epic/')) {
sh 'make SETTINGS_XML=${SETTINGS_XML} BRANCH_NAME=${BRANCH_NAME} java.openapi.deploy_client'
sh 'make SETTINGS_XML=${SETTINGS_XML} BRANCH_NAME=${BRANCH_NAME} java.openapi.deploy_server'
withGPG() {
sh 'make SETTINGS_XML=${SETTINGS_XML} BRANCH_NAME=${BRANCH_NAME} REPO_PUBLIC=${REPO_PUBLIC} GPG_PASSPHRASE=${GPG_PASSPHRASE} GPG_KEYID=${GPG_KEYID} java.openapi.deploy_client'
sh 'make SETTINGS_XML=${SETTINGS_XML} BRANCH_NAME=${BRANCH_NAME} REPO_PUBLIC=${REPO_PUBLIC} GPG_PASSPHRASE=${GPG_PASSPHRASE} GPG_KEYID=${GPG_KEYID} java.openapi.deploy_server'
}
} else {
sh 'make SETTINGS_XML=${SETTINGS_XML} BRANCH_NAME=${BRANCH_NAME} java.openapi.compile_client'
sh 'make SETTINGS_XML=${SETTINGS_XML} BRANCH_NAME=${BRANCH_NAME} java.openapi.compile_server'

20
Makefile
View File

@ -44,35 +44,43 @@ JAVA_PKG_VERSION := $(JAVA_PKG_VERSION)-epic
endif
endif
REPO_PROFILE := private
ifdef REPO_PUBLIC
ifeq ($(REPO_PUBLIC), true)
REPO_PROFILE := public
endif
endif
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 && \
$(MVN) versions:set versions:commit -DnewVersion="$(JAVA_PKG_VERSION)-client" && \
$(MVN) deploy -P="client"
$(MVN) deploy --batch-mode -Dgpg.keyname="$(GPG_KEYID)" -Dgpg.passphrase="$(GPG_PASSPHRASE)" -P="client" -P="$(REPO_PROFILE)"
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 && \
$(MVN) versions:set versions:commit -DnewVersion="$(JAVA_PKG_VERSION)-server" && \
$(MVN) deploy -P="server"
$(MVN) deploy --batch-mode -Dgpg.keyname="$(GPG_KEYID)" -Dgpg.passphrase="$(GPG_PASSPHRASE)" -P="server" -P="$(REPO_PROFILE)"
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

2
build_utils

@ -1 +1 @@
Subproject commit c12c9dd296912ec3c34ad443b448df98fef2556a
Subproject commit be44d69fc87b22a0bb82d98d6eae7658d1647f98

10
pom.xml
View File

@ -6,12 +6,12 @@
<parent>
<groupId>com.rbkmoney</groupId>
<artifactId>parent</artifactId>
<version>1.0.0</version>
<artifactId>library-parent-pom</artifactId>
<version>1.0.8</version>
</parent>
<artifactId>swag-anapi-v2</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.0</version>
<packaging>jar</packaging>
<name>anapi v2</name>
@ -22,11 +22,11 @@
<default.package>com.rbkmoney.openapi.anapi_v2</default.package>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven-plugin-version>1.0.0</maven-plugin-version>
<java.version>8</java.version>
<java.version>11</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<slf4j-version>1.7.21</slf4j-version>
<junit-version>4.13</junit-version>
<junit-version>4.13.2</junit-version>
<servlet-api-version>2.5</servlet-api-version>
<jackson-version>2.12.5</jackson-version>
<spring-version>2.5.3</spring-version>