Skip to content
Permalink
Browse files

[JENKINS-35283]: Update to parent POM

* Update parent POM

Updated to the parent pom and the Jenkins version to 1.625.3.  There were some changes in the findbugs-maven-plugin settings, but running tests with these changes didn't produce any failures.

* Fix findbugs errors

* Revert jenkins.version to and add java.version

Changed the jenkins.version to an older LTS line to get the plugin more current.  The 1.480.3 line is no longer found in the tagged releases in GitHub, so it'd be incredibly difficult to diagnose any core issues found with that version.  Also, I kept the java version at 6 to match the requirement at 1.609.3.

* Security fix for INFRA-588

Change `http` to `https`

* Fixes to various ants.
  • Loading branch information
kwhetstone authored and recena committed Jun 10, 2016
1 parent 8543116 commit f1cf14ce2a24140e152db09a6747e5b017a8aad9
36 pom.xml
@@ -3,29 +3,33 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.480.3</version><!-- which version of Jenkins is this plugin built against? -->
<version>2.9</version>
</parent>

<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>build-view-column</artifactId>
<version>0.3-SNAPSHOT</version>
<packaging>hpi</packaging>

<name>Build View Column Plugin</name>
<url>https://wiki.jenkins-ci.org/display/JENKINS/Build+View+Column+Plugin</url>

<properties>
<jenkins.version>1.609.3</jenkins.version>
<java.level>6</java.level>
</properties>

<!-- get every artifact through repo.jenkins-ci.org, which proxies all the artifacts that we need -->
<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>

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

@@ -36,30 +40,10 @@
</repository>
</distributionManagement>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<xmlOutput>true</xmlOutput>
<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
<failOnError>false</failOnError>
</configuration>
</plugin>
</plugins>
</build>

<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>
</scm>

</project>
</project>
@@ -14,11 +14,11 @@
* This object must have the <tt>column.groovy</tt>. This view
* is called for each cell of this column. The {@link Run} object
* is passed in the "run" variable. The view should render
* a &lt;td> tag.
* a {@code <lt>}td{@code <gt>} tag.
*
* <p>
* The implementation should handle {@code run==null} situation gracefully
* (for example by rendering an empty &lt;td> tag.) As a special case of {@code run==null},
* (for example by rendering an empty {@code <lt>}td{@code <gt>} tag.) As a special case of {@code run==null},
* the caller of {@link BuildViewColumn} can pass in {@code job} that points
* to a {@link Job} that represents a build that's yet to happen.
* An implementation can choose to display something comparable in such a case.
@@ -15,7 +15,11 @@ protected BuildViewColumnDescriptor(Class<? extends BuildViewColumn> clazz) {
protected BuildViewColumnDescriptor() {
}

public static DescriptorExtensionList<BuildViewColumn,BuildViewColumnDescriptor> all() {
return Jenkins.getInstance().getDescriptorList(BuildViewColumn.class);
public static DescriptorExtensionList<BuildViewColumn,BuildViewColumnDescriptor> all() throws IllegalStateException {
Jenkins j = Jenkins.getInstance();
if (j == null) {
throw new IllegalStateException();
}
return j.getDescriptorList(BuildViewColumn.class);
}
}
@@ -1,3 +1,4 @@
<?jelly escape-by-default='true'?>
<div>
Adds a new abstraction for rendering a list of builds as a table.
</div>

0 comments on commit f1cf14c

Please sign in to comment.
You can’t perform that action at this time.