[JENKINS-43507] Migrate Bitbucket Plugin to Traits #53
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,144 +23,162 @@ | |
| ~ 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> | ||
|
|
||
| <parent> | ||
| <groupId>org.jenkins-ci.plugins</groupId> | ||
| <artifactId>plugin</artifactId> | ||
| <version>2.22</version> | ||
| <relativePath /> | ||
| </parent> | ||
|
|
||
| <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> | ||
|
|
||
| <properties> | ||
| <jenkins.version>1.642.3</jenkins.version> | ||
| <scm-api.version>2.2.0-alpha-1</scm-api.version> | ||
| <git.version>3.4.0-alpha-1</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> | ||
|
|
||
| <dependencyManagement> | ||
| <dependencies> | ||
| <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-alpha-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-alpha-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> | ||
|
Member
There was a problem hiding this comment. Is there some real change in dependencies or is it all formatting?
Member
Author
There was a problem hiding this comment. 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> | ||
|
|
||
| <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> | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be 2.2.0-SNAPSHOT to match what is in master?