Skip to content

Commit

Permalink
Most of the changes for JENKINS-33188
Browse files Browse the repository at this point in the history 
Specifically fix plugin descriptions, use new parent pom, fix deps, fix versioning
UI tests still fail due to httpclient version confict in dependencies
  • Loading branch information
@svanoort
svanoort committed Mar 4, 2016
1 parent a9f6b62 commit 8a69569
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 100 deletions.
52 changes: 13 additions & 39 deletions pom.xml
View file
Expand Up @@ -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>
Expand All @@ -46,7 +46,7 @@
</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>
</properties>

Expand All @@ -67,41 +67,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>
32 changes: 32 additions & 0 deletions rest-api/pom.xml
View file
Expand Up @@ -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>

Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion rest-api/src/main/resources/index.jelly
View file
@@ -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>
82 changes: 22 additions & 60 deletions ui/pom.xml
View file
Expand Up @@ -35,20 +35,38 @@
<artifactId>pipeline-stage-view</artifactId>
<version>1.1-SNAPSHOT</version>
<name>Pipeline: Stage View Plugin</name>
<description>Provides a swimlane view of the different stages in a pipeline.
</description>
<packaging>hpi</packaging>
<url>https://wiki.jenkins-ci.org/display/JENKINS/Pipeline+Stage+View+Plugin</url>
<properties>
<!-- TODO: Update to use the new parent pom, then remove all this. -->
<node.version>4.0.0</node.version>
<npm.version>2.13.1</npm.version>
<npm.loglevel>--silent</npm.loglevel>
</properties>

<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-aggregator</artifactId>
<version>${workflow.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pipeline-rest-api</artifactId>
<version>${project.version}</version>
<type>hpi</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>pipeline-rest-api</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-aggregator</artifactId>
<version>${workflow.version}</version>
<classifier>tests</classifier>
</dependency>

<dependency>
Expand Down Expand Up @@ -132,63 +150,7 @@
</build>

<profiles>

<!-- TODO: Update to use the new parent pom, then remove all this. -->
<profile>
<id>node-classifier-linux</id>
<activation><os><family>Linux</family><arch>amd64</arch></os></activation>
<properties><node.download.file>node-v${node.version}-linux-x64.tar.gz</node.download.file></properties>
</profile>
<profile>
<id>node-classifier-mac</id>
<activation><os><family>mac</family></os></activation>
<properties><node.download.file>node-v${node.version}-darwin-x64.tar.gz</node.download.file></properties>
</profile>
<profile>
<id>node-classifier-windows</id>
<activation><os><family>windows</family></os></activation>
<properties><node.download.file>win-x64/node.exe</node.download.file></properties>
</profile>
<profile>
<id>node-download</id>
<activation><file><exists>package.json</exists></file></activation>
<build>
<plugins>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.2.1</version>
<executions>
<execution>
<id>get-node</id>
<phase>initialize</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>https://nodejs.org/dist/v${node.version}/${node.download.file}</url>
<unpack>false</unpack>
<outputDirectory>${project.build.directory}/frontend/v${node.version}</outputDirectory>
</configuration>
</execution>
<execution>
<id>get-npm</id>
<phase>initialize</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>http://registry.npmjs.org/npm/-/npm-${npm.version}.tgz</url>
<unpack>false</unpack>
<outputDirectory>${project.build.directory}/frontend/</outputDirectory>
<outputFileName>npm-${npm.version}.tgz</outputFileName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<!-- Below MIGHT be removable due to something in parent pom but can't find it -->
<profile>
<id>node-npm-check</id>
<activation>
Expand Down

0 comments on commit 8a69569

Please sign in to comment.