Merge pull request #1 from jenkinsci/pom-fixes

Pom fixes for [JENKINS-33188]
jenkinsci · Mar 8, 2016 · 37e3c1c · 37e3c1c
2 parents a9f6b62 + 34603a3
commit 37e3c1c
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 278 deletions.
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>1.609.3</version>
+        <version>2.3</version>
     </parent>
 
     <groupId>org.jenkins-ci.plugins.pipeline-stage-view</groupId>
@@ -46,8 +46,9 @@
     </scm>
 
     <properties>
-        <jenkins.version>1.609.3</jenkins.version> <!-- but see Jenkins-Version override below -->
+        <jenkins.version>1.609.3</jenkins.version>
         <workflow.version>1.14</workflow.version>
+        <jenkins-test-harness.version>2.1</jenkins-test-harness.version>
     </properties>
 
     <repositories>
@@ -67,41 +68,15 @@
         <module>rest-api</module>
         <module>ui</module>
     </modules>
-
-    <dependencies>
-        <dependency> <!-- May not need this -->
-            <groupId>org.jenkins-ci.plugins.workflow</groupId>
-            <artifactId>workflow-aggregator</artifactId>
-            <version>${workflow.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jenkins-ci.plugins.workflow</groupId>
-            <artifactId>workflow-aggregator</artifactId>
-            <version>${workflow.version}</version>
-            <classifier>tests</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.jenkins-ci.plugins.workflow</groupId>
-            <artifactId>workflow-job</artifactId>
-            <version>${workflow.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jenkins-ci.plugins.workflow</groupId>
-            <artifactId>workflow-basic-steps</artifactId>
-            <version>${workflow.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jenkins-ci.plugins.workflow</groupId>
-            <artifactId>workflow-durable-task-step</artifactId>
-            <version>${workflow.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jenkins-ci.plugins.workflow</groupId>
-            <artifactId>workflow-support</artifactId>
-            <version>${workflow.version}</version>
-            <classifier>tests</classifier>
-        </dependency>
-    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <configuration>
+                    <tagNameFormat>pipeline-stage-view-@{project.version}</tagNameFormat>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/rest-api/pom.xml b/rest-api/pom.xml
@@ -35,6 +35,7 @@
     <artifactId>pipeline-rest-api</artifactId>
     <version>1.1-SNAPSHOT</version>
     <name>Pipeline: REST API Plugin</name>
+    <description>Provides a REST API to access pipeline and pipeline run data</description>
     <url>https://wiki.jenkins-ci.org/display/JENKINS/Pipeline+Stage+View+Plugin</url> <!-- TODO update -->
     <packaging>hpi</packaging>
 
@@ -43,6 +44,37 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins.workflow</groupId>
+            <artifactId>workflow-aggregator</artifactId>
+            <version>${workflow.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins.workflow</groupId>
+            <artifactId>workflow-job</artifactId>
+            <version>${workflow.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins.workflow</groupId>
+            <artifactId>workflow-basic-steps</artifactId>
+            <version>${workflow.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins.workflow</groupId>
+            <artifactId>workflow-durable-task-step</artifactId>
+            <version>${workflow.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins.workflow</groupId>
+            <artifactId>workflow-support</artifactId>
+            <version>${workflow.version}</version>
+            <classifier>tests</classifier>
+        </dependency>
+
+        <!-- May be able to remove these due to core -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>

diff --git a/rest-api/src/main/resources/index.jelly b/rest-api/src/main/resources/index.jelly
@@ -1,4 +1,4 @@
 <?jelly escape-by-default='true'?>
 <div>
-  Pipeline REST API Plugin.
+  Provides a REST API to access pipeline and pipeline run data.
 </div>