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

jenkinsci · Feb 21, 2017 · 5b505ec · 5b505ec
1 parent 4b8ddf1
commit 5b505ec
Show file tree

Hide file tree

Showing 17 changed files with 61 additions and 11 deletions.
diff --git a/pipeline-model-declarative-agent/pom.xml b/pipeline-model-declarative-agent/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>
 

diff --git a/pipeline-model-definition/pom.xml b/pipeline-model-definition/pom.xml
@@ -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>

diff --git a/pipeline-model-extensions/pom.xml b/pipeline-model-extensions/pom.xml
@@ -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>
diff --git a/...deldefinition/agent/DeclarativeAgent.java → ...deldefinition/agent/DeclarativeAgent.java b/...deldefinition/agent/DeclarativeAgent.java → ...deldefinition/agent/DeclarativeAgent.java
diff --git a/...ion/agent/DeclarativeAgentDescriptor.java → ...ion/agent/DeclarativeAgentDescriptor.java b/...ion/agent/DeclarativeAgentDescriptor.java → ...ion/agent/DeclarativeAgentDescriptor.java
diff --git a/...inition/agent/DeclarativeAgentScript.java → ...inition/agent/DeclarativeAgentScript.java b/...inition/agent/DeclarativeAgentScript.java → ...inition/agent/DeclarativeAgentScript.java
diff --git a/...modeldefinition/model/BuildCondition.java → ...modeldefinition/model/BuildCondition.java b/...modeldefinition/model/BuildCondition.java → ...modeldefinition/model/BuildCondition.java
diff --git a/...definition/options/DeclarativeOption.java → ...definition/options/DeclarativeOption.java b/...definition/options/DeclarativeOption.java → ...definition/options/DeclarativeOption.java
diff --git a/.../options/DeclarativeOptionDescriptor.java → .../options/DeclarativeOptionDescriptor.java b/.../options/DeclarativeOptionDescriptor.java → .../options/DeclarativeOptionDescriptor.java
diff --git a/...ion/when/DeclarativeStageConditional.java → ...ion/when/DeclarativeStageConditional.java b/...ion/when/DeclarativeStageConditional.java → ...ion/when/DeclarativeStageConditional.java
diff --git a/...eclarativeStageConditionalDescriptor.java → ...eclarativeStageConditionalDescriptor.java b/...eclarativeStageConditionalDescriptor.java → ...eclarativeStageConditionalDescriptor.java
diff --git a/...en/DeclarativeStageConditionalScript.java → ...en/DeclarativeStageConditionalScript.java b/...en/DeclarativeStageConditionalScript.java → ...en/DeclarativeStageConditionalScript.java
diff --git a/...ion/withscript/WithScriptDescribable.java → ...ion/withscript/WithScriptDescribable.java b/...ion/withscript/WithScriptDescribable.java → ...ion/withscript/WithScriptDescribable.java
diff --git a/...tion/withscript/WithScriptDescriptor.java → ...tion/withscript/WithScriptDescriptor.java b/...tion/withscript/WithScriptDescriptor.java → ...tion/withscript/WithScriptDescriptor.java
diff --git a/...finition/withscript/WithScriptScript.java → ...finition/withscript/WithScriptScript.java b/...finition/withscript/WithScriptScript.java → ...finition/withscript/WithScriptScript.java
diff --git a/...tive-agent/src/main/resources/index.jelly → ...extensions/src/main/resources/index.jelly b/...tive-agent/src/main/resources/index.jelly → ...extensions/src/main/resources/index.jelly
@@ -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>
diff --git a/pom.xml b/pom.xml
@@ -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>