diff --git a/.github/workflows/basic-linters.yml b/.github/workflows/basic-linters.yml
new file mode 100644
index 0000000..60b10c5
--- /dev/null
+++ b/.github/workflows/basic-linters.yml
@@ -0,0 +1,15 @@
+name: Vality basic linters
+
+on:
+ pull_request:
+ branches:
+ - master
+ - main
+ push:
+ branches:
+ - master
+ - main
+
+jobs:
+ lint:
+ uses: valitydev/base-workflows/.github/workflows/basic-linters.yml@v1
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..51a9ed2
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,10 @@
+name: Maven Build Artifact
+
+on:
+ pull_request:
+ branches:
+ - '*'
+
+jobs:
+ build:
+ uses: valitydev/base-workflow/.github/workflows/maven-swag-build.yml@v1
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
new file mode 100644
index 0000000..3eb3375
--- /dev/null
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,18 @@
+name: Maven Deploy Artifact
+
+on:
+ push:
+ branches:
+ - 'master'
+ - 'main'
+
+jobs:
+ deploy:
+ uses: valitydev/java-workflow/.github/workflows/maven-swag-deploy.yml@v1
+ secrets:
+ server-username: ${{ secrets.OSSRH_USERNAME }}
+ server-password: ${{ secrets.OSSRH_TOKEN }}
+ deploy-secret-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
+ deploy-secret-key-password: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+ github-token: ${{ secrets.GITHUB_TOKEN }}
+ mm-webhook-url: ${{ secrets.MATTERMOST_WEBHOOK_URL }}
diff --git a/.github/workflows/settings.yml b/.github/workflows/settings.yml
new file mode 100644
index 0000000..9267e7d
--- /dev/null
+++ b/.github/workflows/settings.yml
@@ -0,0 +1,2 @@
+# These settings are synced to GitHub by https://probot.github.io/apps/settings/
+_extends: .github
diff --git a/.gitignore b/.gitignore
index af166b0..73931df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,6 @@ node_modules
# Generated
web_deploy/
-package-lock.json
# User-specific stuff:
.idea/
@@ -58,4 +57,4 @@ package-lock.json
# Gradle:
.idea/gradle.xml
-.idea/libraries
+.idea/libraries
\ No newline at end of file
diff --git a/.redocly.yaml b/.redocly.yaml
new file mode 100644
index 0000000..7b4d32c
--- /dev/null
+++ b/.redocly.yaml
@@ -0,0 +1,18 @@
+# See https://docs.redoc.ly/cli/configuration/ for more information.
+apiDefinitions:
+ core: 'web_deploy/openapi.yaml'
+lint:
+ plugins:
+ - './plugins/local.js'
+ extends:
+ - recommended
+ rules:
+ tag-description: off
+ preprocessors:
+ local/merge-schemas: on
+referenceDocs:
+ showConsole: true
+ layout:
+ scope: section
+ routingStrategy: browser
+ htmlTemplate: ./web/index.html
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index dc8fb9f..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,38 +0,0 @@
-#!groovy
-build('swag-questionary-aggr-proxy', 'docker-host') {
- checkoutRepo()
- loadBuildUtils()
-
- def pipeDefault
- def gitUtils
- runStage('load pipeline') {
- env.JENKINS_LIB = "build_utils/jenkins_lib"
- pipeDefault = load("${env.JENKINS_LIB}/pipeDefault.groovy")
- gitUtils = load("${env.JENKINS_LIB}/gitUtils.groovy")
- }
-
- pipeDefault() {
- runStage('init') {
- withGithubSshCredentials {
- sh 'make wc_init'
- }
- }
-
- runStage('build') {
- sh 'make wc_build'
- }
-
- // Java
- runStage('Build client & server') {
- 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} java.swag.deploy_client'
- sh 'make SETTINGS_XML=${SETTINGS_XML} BRANCH_NAME=${BRANCH_NAME} java.swag.deploy_server'
- } else {
- sh 'make SETTINGS_XML=${SETTINGS_XML} BRANCH_NAME=${BRANCH_NAME} java.swag.compile_client'
- sh 'make SETTINGS_XML=${SETTINGS_XML} BRANCH_NAME=${BRANCH_NAME} java.swag.compile_server'
- }
- }
- }
- }
-}
diff --git a/build_utils b/build_utils
deleted file mode 160000
index a7655bc..0000000
--- a/build_utils
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a7655bc60c877a65cdfe3d9b668021d970d88a76
diff --git a/package.json b/package.json
index 78305a3..65c112a 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"scripts": {
"build": "node ./scripts/build.js",
"swagger": "swagger-repo",
- "test": "swagger-repo validate",
+ "validate": "swagger-repo validate",
"start": "gulp serve"
},
"devDependencies": {
@@ -19,6 +19,7 @@
"portfinder": "^1.0.20",
"shelljs": "^0.8.3",
"swagger-repo": "^1.0.0",
- "swagger-ui": "^2.1.4"
+ "swagger-ui": "^2.1.4",
+ "redoc-cli": "^0.10.2"
}
}
diff --git a/pom.xml b/pom.xml
index 5557c81..077ba52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,9 +5,9 @@
4.0.0
- com.rbkmoney
- parent
- 1.0.0
+ dev.vality
+ library-parent-pom
+ 1.0.2
swag-questionary-aggr
@@ -19,7 +19,7 @@
- com.rbkmoney.swag.questionary_aggr_proxy
+ dev.vality.swag.questionary_aggr_proxy
UTF-8
1.5.21
2.7
diff --git a/spec/definitions/dadata/FmsUnitContent.yaml b/spec/definitions/dadata/FmsUnitContent.yaml
index a51eedc..73c163b 100644
--- a/spec/definitions/dadata/FmsUnitContent.yaml
+++ b/spec/definitions/dadata/FmsUnitContent.yaml
@@ -17,8 +17,8 @@ properties:
type: string
type:
description: Вид подразделения (1 цифра)
- 0 — подразделение ФМС
- 1 — ГУВД или МВД региона
- 2 — УВД или ОВД района или города
- 3 — отделение полиции
+ 0 — подразделение ФМС
+ 1 — ГУВД или МВД региона
+ 2 — УВД или ОВД района или города
+ 3 — отделение полиции
type: string
diff --git a/wercker.yml b/wercker.yml
deleted file mode 100644
index 53e6d97..0000000
--- a/wercker.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-box: node:12
-
-build:
- steps:
- - npm-install
- - npm-test
- - script:
- name: build docsite
- code: npm run build -- ${WERCKER_OUTPUT_DIR}
-
-deploy:
- steps:
- - lukevivier/gh-pages:
- repo: rbkmoney/swag-questionary-aggr-proxy-public
- token: ${GITHUB_API_TOKEN}
- after-steps:
- - slack-notifier:
- url: ${SLACK_WEBHOOK_URL}
- username: "wercker"
-
-release-v:
- steps:
- - script:
- name: prepare release artifacts for branch v1, v2, etc.
- code: mkdir -p out && cp ./swagger.{yaml,json} out/
- - lordlothar99/git-push:
- gh_oauth: ${GITHUB_API_TOKEN}
- branch: release/${WERCKER_GIT_BRANCH}
- basedir: out
- message: Release ${WERCKER_GIT_OWNER}/${WERCKER_GIT_REPOSITORY}@${WERCKER_GIT_COMMIT}
- after-steps:
- - slack-notifier:
- url: ${SLACK_WEBHOOK_URL}
- username: "wercker"