Skip to content
Permalink
Browse files

[FIXED JENKINS-42230] Switch to single extensions API plugin

  • Loading branch information
abayer committed Feb 21, 2017
1 parent 4b8ddf1 commit 5b505ec83044b478b8b868158375457844d72b84
Showing with 61 additions and 11 deletions.
  1. +4 −4 pipeline-model-declarative-agent/pom.xml
  2. +1 −6 pipeline-model-definition/pom.xml
  3. +54 −0 pipeline-model-extensions/pom.xml
  4. 0 ...ensions}/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/DeclarativeAgent.java
  5. 0 ...rc/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/DeclarativeAgentDescriptor.java
  6. 0 ...s}/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/DeclarativeAgentScript.java
  7. 0 ...xtensions}/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/model/BuildCondition.java
  8. 0 ...ions}/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/options/DeclarativeOption.java
  9. 0 ...main/java/org/jenkinsci/plugins/pipeline/modeldefinition/options/DeclarativeOptionDescriptor.java
  10. 0 ...rc/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/DeclarativeStageConditional.java
  11. 0 ...va/org/jenkinsci/plugins/pipeline/modeldefinition/when/DeclarativeStageConditionalDescriptor.java
  12. 0 ...n/java/org/jenkinsci/plugins/pipeline/modeldefinition/when/DeclarativeStageConditionalScript.java
  13. 0 ...rc/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/withscript/WithScriptDescribable.java
  14. 0 ...src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/withscript/WithScriptDescriptor.java
  15. 0 ...ns}/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/withscript/WithScriptScript.java
  16. +1 −1 {pipeline-model-declarative-agent → pipeline-model-extensions}/src/main/resources/index.jelly
  17. +1 −0 pom.xml
@@ -34,15 +34,15 @@
<artifactId>pipeline-model-declarative-agent</artifactId>
<packaging>hpi</packaging>
<name>Pipeline: Declarative Agent API</name>
<description>API for declarative agents in Declarative Pipeline</description>
<description>Replaced by Pipeline: Declarative Extension Points API plugin</description>
<url>https://wiki.jenkins-ci.org/display/JENKINS/Pipeline+Model+Definition+Plugin</url>


<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
<version>2.21</version>
<groupId>org.jenkinsci.plugins</groupId>
<artifactId>pipeline-model-extensions</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

@@ -58,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.jenkinsci.plugins</groupId>
<artifactId>pipeline-model-declarative-agent</artifactId>
<artifactId>pipeline-model-extensions</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -76,11 +76,6 @@
<artifactId>workflow-api</artifactId>
<version>2.8</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<version>2.9</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-multibranch</artifactId>
@@ -0,0 +1,54 @@
<!--
~ The MIT License
~
~ Copyright (c) 2016, CloudBees, Inc.
~
~ Permission is hereby granted, free of charge, to any person obtaining a copy
~ of this software and associated documentation files (the "Software"), to deal
~ in the Software without restriction, including without limitation the rights
~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
~ copies of the Software, and to permit persons to whom the Software is
~ furnished to do so, subject to the following conditions:
~
~ The above copyright notice and this permission notice shall be included in
~ all copies or substantial portions of the Software.
~
~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
~ THE SOFTWARE.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jenkinsci.plugins</groupId>
<artifactId>pipeline-model-parent</artifactId>
<version>1.0.2-SNAPSHOT</version>
</parent>

<groupId>org.jenkinsci.plugins</groupId>
<artifactId>pipeline-model-extensions</artifactId>
<packaging>hpi</packaging>
<name>Pipeline: Declarative Extension Points API</name>
<description>APIs for extension points used in Declarative Pipelines</description>
<url>https://wiki.jenkins-ci.org/display/JENKINS/Pipeline+Model+Definition+Plugin</url>


<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-cps</artifactId>
<version>2.21</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<version>2.9</version>
</dependency>
</dependencies>

</project>
@@ -25,5 +25,5 @@ THE SOFTWARE.

<?jelly escape-by-default='true'?>
<div>
API for declarative agents in Declarative Pipeline.
APIs for extension points used in Declarative Pipelines.
</div>
@@ -67,6 +67,7 @@
<module>pipeline-model-api</module>
<module>pipeline-model-declarative-agent</module>
<module>pipeline-model-definition</module>
<module>pipeline-model-extensions</module>
<module>pipeline-model-json-shaded</module>
</modules>

0 comments on commit 5b505ec

Please sign in to comment.
You can’t perform that action at this time.