Branch: refs/heads/JENKINS-40370
  Home:   https://github.com/jenkinsci/pipeline-model-definition-plugin
  Commit: 0bc6a85050c48bf43ca3d4ef05d8ab9da3a81c3e
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/0bc6a85050c48bf43ca3d4ef05d8ab9da3a81c3e
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTPipelineDef.java
    R 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWrapper.java
    R 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWrappers.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidator.java
    M pipeline-model-api/src/main/resources/ast-schema.json
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Options.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Root.groovy
    R 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Wrappers.groovy
    R 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/WrappersToMap.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ClosureModelTranslator.groovy
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/OptionsTranslator.groovy
    R 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/WrappersToMapTranslator.groovy
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AbstractModelDefTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/OptionsTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ValidatorTest.java
    R 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/WrappersTest.java
    M 
pipeline-model-definition/src/test/resources/errors/invalidWrapperType.groovy
    M 
pipeline-model-definition/src/test/resources/json/errors/invalidWrapperType.json
    M pipeline-model-definition/src/test/resources/json/multipleWrappers.json
    M pipeline-model-definition/src/test/resources/json/simpleWrapper.json
    M pipeline-model-definition/src/test/resources/multipleProperties.groovy
    M pipeline-model-definition/src/test/resources/multipleWrappers.groovy
    M pipeline-model-definition/src/test/resources/simpleWrapper.groovy

  Log Message:
  -----------
  [FIXED JENKINS-40462] Move wrappers into options

This depends on
https://github.com/jenkinsci/pipeline-model-definition-plugin/pull/70
so shouldn't be merged until that's in.

I'm not a huge fan of the hoops we have to jump through to support
wrappers in the same section as Describables, so I may tweak this.


  Commit: 3e40002546a7ba2ead2c5e133ab831088039efc8
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/3e40002546a7ba2ead2c5e133ab831088039efc8
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
    M SYNTAX.md

  Log Message:
  -----------
  SYNTAX.md update

And hey looks like we never added wrappers to SYNTAX.md in the first place!


  Commit: 7151f6d149f2a88730ff025be3a5fadf003ebfa6
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/7151f6d149f2a88730ff025be3a5fadf003ebfa6
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
    M SYNTAX.md
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTMethodCall.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTStep.java
    A 
pipeline-model-api/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ast/Messages.properties
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy
    A 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/Parser.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy
    M 
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/endpoints/ModelConverterAction.java
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/Messages.properties
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineFromDockerfileScript.groovy
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AbstractModelDefTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AgentTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/DeclarativeLinterCommandTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ValidatorTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/WhenStageTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/endpoints/ModelConverterActionTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/parser/GroovyShellDecoratorImplTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParserTest.java
    A pipeline-model-definition/src/test/resources/errors/malformed.groovy

  Log Message:
  -----------
  Merge branch 'master' into jenkins-40462

Conflicts:
        
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy
        
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/AbstractModelDefTest.java
        
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ValidatorTest.java


  Commit: 9e1ee22af7062062f674a5b1699f952576e03867
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/9e1ee22af7062062f674a5b1699f952576e03867
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AbstractModelDefTest.java

  Log Message:
  -----------
  Fix a section type


  Commit: f62e2f3f0730532836c6e0ec3135371850794825
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/f62e2f3f0730532836c6e0ec3135371850794825
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2017-01-04 (Wed, 04 Jan 2017)

  Changed paths:
    M SYNTAX.md
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Options.groovy

  Log Message:
  -----------
  Address review comments.


  Commit: 85b8005184754d721b5a5904fcc917eb3b545593
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/85b8005184754d721b5a5904fcc917eb3b545593
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2017-01-05 (Thu, 05 Jan 2017)

  Changed paths:
    M SYNTAX.md
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTPipelineDef.java
    R 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWrapper.java
    R 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWrappers.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidator.java
    M pipeline-model-api/src/main/resources/ast-schema.json
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Options.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Root.groovy
    R 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Wrappers.groovy
    R 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/WrappersToMap.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ClosureModelTranslator.groovy
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/Messages.properties
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/OptionsTranslator.groovy
    R 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/WrappersToMapTranslator.groovy
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AbstractModelDefTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/OptionsTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ValidatorTest.java
    R 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/WrappersTest.java
    M 
pipeline-model-definition/src/test/resources/errors/invalidWrapperType.groovy
    M 
pipeline-model-definition/src/test/resources/json/errors/invalidWrapperType.json
    M pipeline-model-definition/src/test/resources/json/multipleWrappers.json
    M pipeline-model-definition/src/test/resources/json/simpleWrapper.json
    M pipeline-model-definition/src/test/resources/multipleProperties.groovy
    M pipeline-model-definition/src/test/resources/multipleWrappers.groovy
    M pipeline-model-definition/src/test/resources/simpleWrapper.groovy

  Log Message:
  -----------
  Merge pull request #72 from abayer/jenkins-40462

[FIXED JENKINS-40462] Move wrappers into options


  Commit: 729dfabcd270c25f0ceaadfd012c019f8da70e74
      
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/729dfabcd270c25f0ceaadfd012c019f8da70e74
  Author: Andrew Bayer <andrew.ba...@gmail.com>
  Date:   2017-01-05 (Thu, 05 Jan 2017)

  Changed paths:
    M SYNTAX.md
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTPipelineDef.java
    R 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWrapper.java
    R 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/ast/ModelASTWrappers.java
    M 
pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidator.java
    M pipeline-model-api/src/main/resources/ast-schema.json
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/Utils.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Options.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Root.groovy
    R 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Wrappers.groovy
    R 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/WrappersToMap.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/JSONParser.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy
    M 
pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/validator/ModelValidatorImpl.groovy
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ClosureModelTranslator.groovy
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/Messages.properties
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy
    M 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/OptionsTranslator.groovy
    R 
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/WrappersToMapTranslator.groovy
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/AbstractModelDefTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/OptionsTest.java
    M 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/ValidatorTest.java
    R 
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/WrappersTest.java
    M 
pipeline-model-definition/src/test/resources/errors/invalidWrapperType.groovy
    M 
pipeline-model-definition/src/test/resources/json/errors/invalidWrapperType.json
    M pipeline-model-definition/src/test/resources/json/multipleWrappers.json
    M pipeline-model-definition/src/test/resources/json/simpleWrapper.json
    M pipeline-model-definition/src/test/resources/multipleProperties.groovy
    M pipeline-model-definition/src/test/resources/multipleWrappers.groovy
    M pipeline-model-definition/src/test/resources/simpleWrapper.groovy

  Log Message:
  -----------
  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


Compare: 
https://github.com/jenkinsci/pipeline-model-definition-plugin/compare/289e89e07739...729dfabcd270

-- 
You received this message because you are subscribed to the Google Groups 
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to jenkinsci-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to