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-43507] Migrate Bitbucket Plugin to Traits #53

Merged
merged 44 commits into from
Jul 5, 2017
Merged

[JENKINS-43507] Migrate Bitbucket Plugin to Traits #53

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
43b5668
[JENKINS-43433] Adapt to ChangeRequestSCMHead2
stephenc Apr 11, 2017
301f8d0
[JENKINS-43433] Pick up scm api snapshot
stephenc Apr 11, 2017
74b8531
Merge branch 'jenkins-44413' into jenkins-43507
stephenc May 22, 2017
b8f9be3
[JENKINS-43507] Add endpoints to global configuration
stephenc May 29, 2017
3530fca
[JENKINS-43507] Add endpoints tests
stephenc May 29, 2017
dfd47ff
[JENKINS-43507] Add endpoints to global configuration
stephenc May 30, 2017
ee67e57
[JENKINS-43507] Tidy up implementation debt in BitbucketApi implement…
stephenc Jun 2, 2017
fd9e115
[JENKINS-43507] Align with endpoints expected serverUrls
stephenc Jun 2, 2017
824dfd2
[JENKINS-43507] Add backfill until JENKINS-42443 is available in base…
stephenc Jun 2, 2017
0e1e96a
[JENKINS-43507] Widen types of input parameter
stephenc Jun 7, 2017
88c4be3
[JENKINS-43507] Add source context and request
stephenc Jun 7, 2017
933a75a
[JENKINS-43507] Add navigator context and request
stephenc Jun 7, 2017
8f636d6
[JENKINS-40475] Use a more resilient API call to determine the commit…
stephenc Jun 8, 2017
95aac94
[JENKINS-43507] checkPathExists can take a branch OR a hash
stephenc Jun 8, 2017
50166af
[JENKINS-43507] Add API to derive web links to endpoint configuration
stephenc Jun 9, 2017
a4c6bf3
[JENKINS-43507] Switch to trait based configuration
stephenc Jun 12, 2017
71b6cae
[JENKINS-43507] Curses upon you IntelliJ with your "Reformat code" ch…
stephenc Jun 12, 2017
0d083de
[JENKINS-43507] Pick up latest timestamp snapshots
stephenc Jun 12, 2017
e0e18b2
[JENKINS-43507] Some code simplification
stephenc Jun 13, 2017
b0c72b8
[JENKINS-43507] Address @amuniz code review comments
stephenc Jun 15, 2017
933aae0
[JENKINS-43507] Pick up changes for JENKINS-44891
stephenc Jun 15, 2017
255396d
[JENKINS-43507] Pick up latest -SNAPSHOTs
stephenc Jun 16, 2017
4c80d63
[JENKINS-43507] Minor formatting tweaks
stephenc Jun 19, 2017
e0875fa
[JENKINS-43507] Documentation and formatting
stephenc Jun 19, 2017
9b71dd1
[JENKINS-43507] Now is good
stephenc Jun 19, 2017
b5f8765
[JENKINS-43507] i18n
stephenc Jun 19, 2017
0874e73
[JENKINS-43507] re-use Throwable.getMessage()
stephenc Jun 19, 2017
23b61e5
[JENKINS-43507] Remove redundant check (only ever called when value i…
stephenc Jun 19, 2017
c0cfdd7
[JENKINS-43507] De-duplicate and simplify
stephenc Jun 19, 2017
e1b6547
[JENKINS-43507] Remove potential user error
stephenc Jun 19, 2017
103082f
[JENKINS-43507] Fix formatting
stephenc Jun 19, 2017
107f747
[JENKINS-43507] Pick up alpha-1
stephenc Jun 20, 2017
ec0fc5b
Merge branch 'master' into jenkins-43507
stephenc Jun 20, 2017
6821f23
[maven-release-plugin] prepare release cloudbees-bitbucket-branch-sou…
stephenc Jun 20, 2017
8b3b9eb
[maven-release-plugin] prepare for next development iteration
stephenc Jun 20, 2017
17541eb
[JENKINS-43507] US people want to spell things incorrectly
stephenc Jun 20, 2017
3fa5f43
[JENKINS-43507] Fix trait drop-down list population
stephenc Jun 24, 2017
b9a3016
[JENKINS-43507] Prepare for -alpha-4
stephenc Jun 26, 2017
3c9bb0f
[maven-release-plugin] prepare release cloudbees-bitbucket-branch-sou…
stephenc Jun 26, 2017
6f9a49f
[maven-release-plugin] prepare for next development iteration
stephenc Jun 26, 2017
7ecc02d
[JENKINS-43507] Add missing continue
stephenc Jul 5, 2017
b307aaf
Merge branch 'master' into jenkins-43507
stephenc Jul 5, 2017
425d7bd
Merge branch 'master' into jenkins-43507
stephenc Jul 5, 2017
ee66530
[JENKINS-43507] Remove (now) useless dependency
stephenc Jul 5, 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
279 changes: 149 additions & 130 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,145 +22,164 @@
~ 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>
<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.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.22</version>
<relativePath />
</parent>
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.22</version>
<relativePath/>
</parent>

<artifactId>cloudbees-bitbucket-branch-source</artifactId>
<version>2.1.3-SNAPSHOT</version>
<packaging>hpi</packaging>
<artifactId>cloudbees-bitbucket-branch-source</artifactId>
<version>2.2.0-SNAPSHOT</version>
<packaging>hpi</packaging>

<name>Bitbucket Branch Source Plugin</name>
<url>https://wiki.jenkins-ci.org/display/JENKINS/Bitbucket+Branch+Source+Plugin</url>
<description>Discover and build Bitbucket Cloud and Bitbucket Server pull requests and branches and send status notifications with the build result.</description>
<licenses>
<license>
<name>MIT License</name>
<url>http://opensource.org/licenses/MIT</url>
</license>
</licenses>
<name>Bitbucket Branch Source Plugin</name>
<url>https://wiki.jenkins-ci.org/display/JENKINS/Bitbucket+Branch+Source+Plugin</url>
<description>Discover and build Bitbucket Cloud and Bitbucket Server pull requests and branches and send status
notifications with the build result.
</description>
<licenses>
<license>
<name>MIT License</name>
<url>http://opensource.org/licenses/MIT</url>
</license>
</licenses>

<properties>
<jenkins.version>1.642.3</jenkins.version>
<scm-api.version>2.0.4</scm-api.version>
</properties>
<properties>
<jenkins.version>1.642.3</jenkins.version>
<scm-api.version>2.2.0-20170612.200107-11</scm-api.version>
<git.version>3.4.0-20170612.203958-2</git.version>
</properties>

<scm>
<connection>scm:git:git://github.com/jenkinsci/bitbucket-branch-source-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/bitbucket-branch-source-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/bitbucket-branch-source-plugin</url>
<tag>HEAD</tag>
</scm>
<scm>
<connection>scm:git:git://github.com/jenkinsci/bitbucket-branch-source-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/bitbucket-branch-source-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/bitbucket-branch-source-plugin</url>
<tag>HEAD</tag>
</scm>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>${scm-api.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
<version>2.6.5</version>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>mercurial</artifactId>
<version>1.58</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<version>1.9.13</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>display-url-api</artifactId>
<version>0.2</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>branch-api</artifactId>
<version>2.0.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>${scm-api.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
<version>2.6.5</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-multibranch</artifactId>
<version>2.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-aggregator</artifactId>
<version>1.15</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>${scm-api.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
<version>${git.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>mercurial</artifactId>
<version>2.0-20170612.200544-1</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<version>1.9.13</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>display-url-api</artifactId>
<version>0.2</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>branch-api</artifactId>
<version>2.0.11-20170612.201016-1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>${scm-api.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
<version>${git.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-multibranch</artifactId>
<version>2.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-aggregator</artifactId>
<version>1.15</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>

</dependencies>
Copy link
Member

Choose a reason for hiding this comment

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

Is there some real change in dependencies or is it all formatting?

Copy link
Member Author

Choose a reason for hiding this comment

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

https://github.com/jenkinsci/bitbucket-branch-source-plugin/pull/53/files?w=1 says only version bumps in scm-api, branch-api, git and mercurial plugins


<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>
<repositories>
<repository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>repo.jenkins-ci.org</id>
<url>http://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>

<build>
<plugins>
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<configuration>
<compatibleSinceVersion>2.0.0</compatibleSinceVersion>
</configuration>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>generate-taglib-interface</goal>
</goals>
</execution>
</executions>
<configuration>
<compatibleSinceVersion>2.0.0</compatibleSinceVersion>
</configuration>
</plugin>
</plugins>
</build>

</project>
Loading