Skip to content

Commit

Permalink
Merge branch 'JENKINS-33874' of git://github.com/andresrc/git-plugin …
Browse files Browse the repository at this point in the history 
…into 2.5.0-beta2
  • Loading branch information
@MarkEWaite
MarkEWaite committed May 21, 2016
2 parents bb0ec5f + daf453d commit 7a7da1e
Show file tree
Hide file tree
Showing 15 changed files with 246 additions and 271 deletions.
166 changes: 44 additions & 122 deletions pom.xml
View file
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.580</version>
<version>2.9</version>
</parent>

<licenses>
Expand All @@ -22,107 +22,40 @@
<url>http://wiki.jenkins-ci.org/display/JENKINS/Git+Plugin</url>

<properties>
<findbugs-maven-plugin.version>3.0.3</findbugs-maven-plugin.version>
<jacoco-maven-plugin.version>0.7.4.201502262128</jacoco-maven-plugin.version>
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
<maven-hpi-plugin.version>1.117</maven-hpi-plugin.version>
<maven-localizer-plugin.version>1.23</maven-localizer-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-site-plugin.version>3.5</maven-site-plugin.version>
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jenkins.version>1.609.3</jenkins.version>
<java.level>6</java.level>
<!-- Use the same configuration than before. -->
<concurrency>2</concurrency>
<!-- TODO: Ongoing work on https://github.com/MarkEWaite/git-plugin/tree/master-findbugs-fixes. -->
<findbugs.failOnError>false</findbugs.failOnError>
</properties>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs-maven-plugin.version}</version>
<configuration>
<excludeFilterFile>src/findbugs/excludesFilter.xml</excludeFilterFile>
<failOnError>${maven.findbugs.failure.strict}</failOnError>
</configuration>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.4.201502262128</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${maven-enforcer-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.jvnet.localizer</groupId>
<artifactId>maven-localizer-plugin</artifactId>
<version>${maven-localizer-plugin.version}</version>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<versionRange>[1.0,)</versionRange>
<goals>
<goal>display-info</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<versionRange>[1.3,)</versionRange>
<goals>
<goal>generateTestStubs</goal>
<goal>testCompile</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>com.infradna.tool</groupId>
<artifactId>bridge-method-injector</artifactId>
<versionRange>[1.4,)</versionRange>
<goals>
<goal>process</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
<version>1.4.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${maven-site-plugin.version}</version>
<version>3.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<version>${maven-hpi-plugin.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>com.infradna.tool</groupId>
<artifactId>bridge-method-injector</artifactId>
Expand All @@ -135,27 +68,9 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${maven-release-plugin.version}</version>
<configuration>
<goals>deploy</goals>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<systemPropertyVariables>
<java.awt.headless>true</java.awt.headless>
Expand All @@ -167,7 +82,6 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco-maven-plugin.version}</version>
<executions>
<execution>
<id>pre-unit-test</id>
Expand Down Expand Up @@ -200,13 +114,31 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>display-info</id>
<configuration>
<rules>
<enforceBytecodeVersion>
<excludes combine.children="append">
<!-- Loaded conditionally. -->
<exclude>org.eclipse.jgit:org.eclipse.jgit.java7</exclude>
</excludes>
</enforceBytecodeVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

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

Expand Down Expand Up @@ -266,23 +198,21 @@
<version>1.16</version>
</dependency>


<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.4.1</version>
<version>4.5</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -325,26 +255,18 @@
</dependency>
</dependencies>

<distributionManagement>
<repository>
<id>maven.jenkins-ci.org</id>
<name>jenkinsci-releases</name>
<url>https://repo.jenkins-ci.org/releases/</url>
</repository>
</distributionManagement>

<scm>
<connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
<url>http://github.com/jenkinsci/${project.artifactId}-plugin</url>
<tag>HEAD</tag>
</scm>

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

2 changes: 1 addition & 1 deletion src/main/java/hudson/plugins/git/BranchSpec.java
View file
Expand Up @@ -78,7 +78,7 @@ public boolean matches(String ref, EnvVars env) {
}

/**
* @deprecated use filterMatching(Collection<String>, EnvVars)
* @deprecated use {@link #filterMatching(Collection, EnvVars)}
*/
public List<String> filterMatching(Collection<String> branches) {
EnvVars env = new EnvVars();
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/hudson/plugins/git/GitSCM.java
View file
Expand Up @@ -37,7 +37,6 @@
import hudson.triggers.SCMTrigger;
import hudson.util.DescribableList;
import hudson.util.FormValidation;
import hudson.util.IOException2;
import hudson.util.ListBoxModel;
import jenkins.model.Jenkins;
import net.sf.json.JSONObject;
Expand Down Expand Up @@ -570,7 +569,7 @@ public PollingResult compareRemoteRevisionWith(Job<?, ?> project, Launcher launc
try {
return compareRemoteRevisionWithImpl( project, launcher, workspace, listener);
} catch (GitException e){
throw new IOException2(e);
throw new IOException(e);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/hudson/plugins/git/GitStatus.java
View file
Expand Up @@ -178,7 +178,7 @@ private static String normalizePath(String path) {
}

/**
* Contributes to a {@link #doNotifyCommit(String, String, String)} response.
* Contributes to a {@link #doNotifyCommit(HttpServletRequest, String, String, String)} response.
*
* @since 1.4.1
*/
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/hudson/plugins/git/browser/GitoriousWeb.java
View file
Expand Up @@ -34,7 +34,7 @@ public URL getChangeSetLink(GitChangeSet changeSet) throws IOException {
/**
* Creates a link to the commit diff.
*
* https://[Gitorious URL]/commit/a9182a07750c9a0dfd89a8461adf72ef5ef0885b/diffs?diffmode=sidebyside&fragment=1#[path to file]
* {@code https://[Gitorious URL]/commit/a9182a07750c9a0dfd89a8461adf72ef5ef0885b/diffs?diffmode=sidebyside&fragment=1#[path to file]}
*
* @param path
* @return diff link
Expand All @@ -48,7 +48,7 @@ public URL getDiffLink(Path path) throws IOException {

/**
* Creates a link to the file.
* https://[Gitorious URL]/blobs/a9182a07750c9a0dfd89a8461adf72ef5ef0885b/pom.xml
* {@code https://[Gitorious URL]/blobs/a9182a07750c9a0dfd89a8461adf72ef5ef0885b/pom.xml}
*
* @param path
* @return file link
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/hudson/plugins/git/browser/RhodeCode.java
View file
Expand Up @@ -32,7 +32,7 @@ private QueryBuilder param(URL url) {

/**
* Creates a link to the change set
* http://[RhodeCode URL]/changeset/[commit]
* {@code http://[RhodeCode URL]/changeset/[commit]}
*
* @param changeSet commit hash
* @return change set link
Expand All @@ -46,7 +46,7 @@ public URL getChangeSetLink(GitChangeSet changeSet) throws IOException {

/**
* Creates a link to the file diff.
* http://[RhodeCode URL]/diff/[path]?diff2=[commit]&diff1=[commit]&diff=diff+to+revision
* {@code http://[RhodeCode URL]/diff/[path]?diff2=[commit]&diff1=[commit]&diff=diff+to+revision}
*
* @param path affected file path
* @return diff link
Expand All @@ -61,7 +61,7 @@ public URL getDiffLink(Path path) throws IOException {

/**
* Creates a link to the file.
* http://[RhodeCode URL]/files/[commit]/[path]
* {@code http://[RhodeCode URL]/files/[commit]/[path]}
*
* @param path affected file path
* @return diff link
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/hudson/plugins/git/browser/Stash.java
View file
Expand Up @@ -47,7 +47,7 @@ public URL getChangeSetLink(GitChangeSet changeSet) throws IOException {

/**
* Creates a link to the file diff.
* http://[Stash URL]/diff/[path]?at=[commit]&until=[commit]
* {@code http://[Stash URL]/diff/[path]?at=[commit]&until=[commit]}
*
* @param path affected file path
* @return diff link
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/hudson/plugins/git/util/BuildData.java
View file
Expand Up @@ -27,7 +27,7 @@ public class BuildData implements Action, Serializable, Cloneable {
private static final long serialVersionUID = 1L;

/**
* Map of branch name -> build (Branch name to last built SHA1).
* Map of branch {@code name -> build} (Branch name to last built SHA1).
*
* <p>
* This map contains all the branches we've built in the past (including the build that this {@link BuildData}
Expand Down

0 comments on commit 7a7da1e

Please sign in to comment.