Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Declarative to aggregator #16

Merged
merged 3 commits into from
Feb 1, 2017
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</parent>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-aggregator</artifactId>
<version>2.5-beta-1-SNAPSHOT</version>
<version>2.5-SNAPSHOT</version>
<packaging>hpi</packaging>
<name>Pipeline</name>
<url>https://wiki.jenkins-ci.org/display/JENKINS/Pipeline+Plugin</url>
Expand Down Expand Up @@ -63,23 +63,23 @@
</pluginRepository>
</pluginRepositories>
<properties>
<jenkins.version>1.642.3</jenkins.version>
<jenkins.version>2.7.1</jenkins.version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think 2.7.3 would be more appropriate.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would require Blue Ocean to bump their minimum (which is 2.7.1 currently)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe BO should require 2.7.3?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just stick with 2.7.1? That's the first LTS release of 2.x, it's what Declarative and BO depend on, we generally stick to depending on the earliest possible LTS release rather than a later one, etc. I know of no reason to depend on 2.7.3 rather than 2.7.1.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also would prefer 2.7.3. For Pipeline plugins we generally depend on the most recent update in a given LTS line. This ensures that tests etc. are incorporating known fixes.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I'll bump it to 2.7.3 - neither BO nor Declarative depend on workflow-aggregator, so they're not going to get messed up by bumping the aggregator core dependency.

</properties>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>workflow-step-api</artifactId>
<version>2.3</version>
<version>2.7</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>workflow-api</artifactId>
<version>2.3</version>
<version>2.8</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>workflow-support</artifactId>
<version>2.5</version>
<version>2.12</version>
<exclusions>
<exclusion>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -90,22 +90,22 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>workflow-durable-task-step</artifactId>
<version>2.4</version>
<version>2.8</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>workflow-scm-step</artifactId>
<version>2.2</version>
<version>2.3</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>workflow-cps</artifactId>
<version>2.17</version>
<version>2.24</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>workflow-cps-global-lib</artifactId>
<version>2.3</version>
<version>2.5</version>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
Expand All @@ -116,27 +116,27 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>workflow-job</artifactId>
<version>2.6</version>
<version>2.9</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>workflow-basic-steps</artifactId>
<version>2.1</version>
<version>2.3</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>workflow-multibranch</artifactId>
<version>2.10-beta-1</version>
<version>2.9.2</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>pipeline-build-step</artifactId>
<version>2.2</version>
<version>2.4</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>pipeline-input-step</artifactId>
<version>2.1</version>
<version>2.5</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -146,17 +146,17 @@
<dependency>
<groupId>org.jenkins-ci.plugins.pipeline-stage-view</groupId>
<artifactId>pipeline-stage-view</artifactId>
<version>2.0</version>
<version>2.4</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>pipeline-milestone-step</artifactId>
<version>1.0</version>
<version>1.3</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>pipeline-github-lib</artifactId>
<version>1.0-beta-1</version>
<groupId>org.jenkinsci.plugins</groupId>
<artifactId>pipeline-model-definition</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
<build>
Expand Down