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.

Sign up for GitHub

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

[JENKINS-41631] Demonstration of POM update #113

Merged
merged 3 commits into from
Sep 1, 2017
Merged

[JENKINS-41631] Demonstration of POM update #113

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
019e528
[JENKINS-41631] Demonstration of POM update.
jglick Jun 13, 2017
9ec62ef
Merge branch 'master' into requireUpperBoundDeps-JENKINS-41631
jglick Jun 26, 2017
dd78f25
plugin-pom 2.31
jglick Jun 26, 2017
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: 36 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.23</version>
<version>2.31-20170612.235547-1</version> <!-- TODO https://github.com/jenkinsci/plugin-pom/pull/67 -->
Copy link
Contributor

Choose a reason for hiding this comment

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

If you don't need this right away, do you want to wait until the next version is cut? This plugin isn't released frequently, so it might be worth waiting until the plugin-pom is updated.

Copy link
Member Author

Choose a reason for hiding this comment

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

Certainly I was not proposing a merge unless and until the dependency is merged and released. That just applies to any use of snapshots.

Really this PR is not intended to accomplish anything in particular except to demonstrate that the upstream PR is consumable.

<relativePath/>
</parent>

<licenses>
Expand Down Expand Up @@ -38,6 +39,12 @@
<artifactId>subversion</artifactId>
<version>2.5.7</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -66,13 +73,17 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>conditional-buildstep</artifactId>
<version>1.3.1</version>
</dependency>
</dependency>

<!-- Workflow plugin imports are used to test compatibility -->
<dependency>
Expand All @@ -86,6 +97,12 @@
<artifactId>workflow-cps</artifactId>
<version>2.27</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jenkins-ci</groupId>
<artifactId>symbol-annotation</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand Down Expand Up @@ -116,6 +133,12 @@
<artifactId>matrix-auth</artifactId>
<version>1.4</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jenkins-ci.plugins.icon-shim</groupId>
<artifactId>icon-set</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Expand All @@ -129,6 +152,17 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>script-security</artifactId>
<version>1.25</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>token-macro</artifactId>
<version>1.10</version>
<scope>test</scope>
</dependency>
</dependencies>

<scm>
Expand Down