Skip to content

[JENKINS-39355 Follow-up] Unpicking some of the replicated hacks from… #23

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

Merged
amuniz merged 18 commits into from
Jan 16, 2017
Merged

[JENKINS-39355 Follow-up] Unpicking some of the replicated hacks from… #23

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0d5b3a4
[JENKINS-39355 Follow-up] Unpicking some of the replicated hacks from…
stephenc Oct 28, 2016
a2da353
[JENKINS-39355 Follow-up] More dead code removed
stephenc Oct 28, 2016
76c087f
[JENKINS-39355 Follow-up] Remove data duplication from BranchSCMHead
stephenc Nov 1, 2016
b932be3
[JENKINS-39355 Follow-up] Sync with latest scm-api improvements
stephenc Nov 3, 2016
a0adbe0
[JENKINS-39355] Switch to the utility checkInterrupt() method for int…
stephenc Nov 3, 2016
6373fb6
Pick up cloudbees-folders 5.14
stephenc Dec 5, 2016
6899192
[JENKINS-39355 Follow-up] Lots of changes to make this work with the …
stephenc Dec 15, 2016
e1f33de
Fix mock
stephenc Dec 15, 2016
74f9d75
Tidy up data migration
stephenc Dec 15, 2016
8d83333
No need to retain author tag
stephenc Dec 15, 2016
7a902d4
Typo
stephenc Dec 15, 2016
99c2d3c
We need the mercurial plugin update too
stephenc Dec 15, 2016
80adc94
Prepare for beta-1
stephenc Dec 16, 2016
93141b3
Pick up 2.6.2-beta-1 of git plugin
stephenc Dec 16, 2016
049155b
Merge branch 'master' into jenkins-39355-follow-up
amuniz Jan 12, 2017
991057b
[JENKINS-39355 Follow-up] Address code review comments
stephenc Jan 12, 2017
604e7b4
remove junk line
stephenc Jan 12, 2017
68a7ec4
Findbugs catches bugs... who knew
stephenc Jan 12, 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
6 changes: 6 additions & 0 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
== BitBucket Branch Source Plugin

=== Notes

* Unlike GitHub, in BitBucket, https://bitbucket.org/site/master/issues/4828/team-admins-dont-have-read-access-to-forks[team admins do not have access to forks].
This means that when you have a private repository, or a private fork of a public repository, the team admin will not be able to see the PRs within the fork.
Copy link
Member

@amuniz amuniz Jan 2, 2017

Choose a reason for hiding this comment

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

In general the user configured for scanning needs to have read permission in all repositories intended to be scanned.

Copy link
Member

@amuniz amuniz Jan 2, 2017

Choose a reason for hiding this comment

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

Including the forks where a PR to be scanned lives.

26 changes: 17 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</parent>

<artifactId>cloudbees-bitbucket-branch-source</artifactId>
<version>1.9-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<packaging>hpi</packaging>

<name>Bitbucket Branch Source Plugin</name>
Expand Down Expand Up @@ -60,17 +60,12 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>1.2</version>
</dependency>
<dependency><!-- Remove once DisplayNameItemListener is extracted -->
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>branch-api</artifactId>
<version>1.10.2</version>
<version>2.0.1-SNAPSHOT</version>
Copy link
Member

@jglick jglick Dec 15, 2016

Choose a reason for hiding this comment

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

ditto

Copy link
Member Author

@stephenc stephenc Dec 15, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

Downstream of jenkinsci/scm-api-plugin#19

</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
<version>2.3.5</version>
<version>2.6.1-SNAPSHOT</version>
Copy link
Member

@jglick jglick Dec 15, 2016

Choose a reason for hiding this comment

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

Is this waiting for a specific PR? If so, mention it here in a comment.

Copy link
Member Author

@stephenc stephenc Dec 15, 2016

Choose a reason for hiding this comment

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

downstream of jenkinsci/git-plugin#454

<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
Expand All @@ -81,7 +76,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>mercurial</artifactId>
<version>1.54</version>
<version>1.58-SNAPSHOT</version>
Copy link
Member Author

@stephenc stephenc Dec 15, 2016

Choose a reason for hiding this comment

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

Downstream of jenkinsci/mercurial-plugin#92

</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
Expand All @@ -93,6 +88,19 @@
<artifactId>display-url-api</artifactId>
<version>0.2</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>branch-api</artifactId>
<version>2.0.0-SNAPSHOT</version>
Copy link
Member

@jglick jglick Dec 15, 2016

Choose a reason for hiding this comment

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

ditto

Copy link
Member Author

@stephenc stephenc Dec 15, 2016

Choose a reason for hiding this comment

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

Downstream of jenkinsci/branch-api-plugin#60

<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>2.0.1-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-multibranch</artifactId>
Expand Down
Loading