Permalink
Please
sign in to comment.
Browse files
Merge branch 'master' into JENKINS-40370
Conflicts: pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidator.java pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ValidatorTest.java
- Loading branch information
Showing
with
113 additions
and 608 deletions.
- +1 −2 SYNTAX.md
- +1 −28 ...del-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTPipelineDef.java
- +0 −52 ...e-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWrapper.java
- +0 −120 ...-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWrappers.java
- +0 −6 ...el-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidator.java
- +1 −18 pipeline-model-api/src/main/resources/ast-schema.json
- +19 −10 ...line-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy
- +43 −12 ...el-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Options.groovy
- +0 −7 ...model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Root.groovy
- +0 −63 ...l-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Wrappers.groovy
- +0 −33 ...inition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/WrappersToMap.groovy
- +0 −17 ...efinition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy
- +3 −48 ...finition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy
- +0 −31 ...rc/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy
- +0 −5 ...n/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ClosureModelTranslator.groovy
- +0 −3 ...-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/Messages.properties
- +6 −6 ...inition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy
- +5 −1 ...nition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/OptionsTranslator.groovy
- +0 −82 .../src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/WrappersToMapTranslator.groovy
- +1 −1 ...definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AbstractModelDefTest.java
- +25 −1 ...ne-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/OptionsTest.java
- +1 −2 ...-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ValidatorTest.java
- +0 −54 ...e-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/WrappersTest.java
- +1 −1 pipeline-model-definition/src/test/resources/errors/invalidWrapperType.groovy
- +1 −1 pipeline-model-definition/src/test/resources/json/errors/invalidWrapperType.json
- +1 −1 pipeline-model-definition/src/test/resources/json/multipleWrappers.json
- +1 −1 pipeline-model-definition/src/test/resources/json/simpleWrapper.json
- +1 −0 pipeline-model-definition/src/test/resources/multipleProperties.groovy
- +1 −1 pipeline-model-definition/src/test/resources/multipleWrappers.groovy
- +1 −1 pipeline-model-definition/src/test/resources/simpleWrapper.groovy

Oops, something went wrong.
0 comments on commit
729dfab