Skip to content

Commit

Permalink
Merge pull request #41 from oleg-nenashev/JENKINS-49176-jep-200
Browse files Browse the repository at this point in the history 
[JENKINS-49176,JENKINS-49185] - Make the plugin compatible with Jenkins 2.102+ and fix concurrency issues
  • Loading branch information
@rmpestano
rmpestano committed Jan 26, 2018
2 parents a3fa178 + cf4f17f commit 8ea5460
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 39 deletions.
2 changes: 2 additions & 0 deletions Jenkinsfile
View file
@@ -0,0 +1,2 @@
// Build the plugin using https://github.com/jenkins-infra/pipeline-library
buildPlugin()
78 changes: 43 additions & 35 deletions pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.9</version>
<version>3.2</version>
<relativePath />
</parent>
<artifactId>last-changes</artifactId>
Expand All @@ -17,9 +17,6 @@
<jenkins.version>1.642.1</jenkins.version>
<!-- Java Level to use. Java 7 required when using core >= 1.612 -->
<java.level>7</java.level>
<!-- Jenkins Test Harness version you use to test the plugin. -->
<!-- For Jenkins version >= 1.580.1 use JTH 2.x or higher. -->
<jenkins-test-harness.version>2.20</jenkins-test-harness.version>
<!-- Other properties you may want to use:
~ hpi-plugin.version: The HPI Maven Plugin version used by the plugin..
~ stapler-plugin.version: The Stapler Maven plugin version required by the plugin.
Expand Down Expand Up @@ -59,17 +56,43 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>0.2</version>
<version>2.0.8</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
<version>2.3.5</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git-client</artifactId>
<version>1.19.0</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ssh-credentials</artifactId>
<version>1.11</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<version>2.1.14</version>
<exclusions>
<exclusion>
<groupId>org.jenkins-ci</groupId>
<artifactId>annotation-indexer</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>mailer</artifactId>
<version>1.13</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>subversion</artifactId>
<version>2.5</version>
<version>2.8</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -86,8 +109,14 @@
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-step-api</artifactId>
<version>2.3</version>
<version>2.10</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.jenkins-ci</groupId>
<artifactId>annotation-indexer</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand All @@ -96,12 +125,6 @@
<optional>true</optional>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
Expand Down Expand Up @@ -129,50 +152,35 @@
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-basic-steps</artifactId>
<version>1.14</version>
<artifactId>workflow-scm-step</artifactId>
<version>2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>2.0.4</version>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-basic-steps</artifactId>
<version>2.0</version>
<scope>test</scope>
</dependency>
</dependencies>

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

<build>
<finalName>last-changes</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<version>2.1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/github/jenkins/lastchanges/LastChangesPublisher.java
View file
Expand Up @@ -80,8 +80,6 @@ public class LastChangesPublisher extends Recorder implements SimpleBuildStep {

private static final short RECURSION_DEPTH = 50;

private static final DateFormat DATE_FORMAT = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT);

private String specificRevision; //revision id to crete the diff

private String specificBuild; // create the diff with the revision of an specific build
Expand Down Expand Up @@ -322,7 +320,8 @@ private List<CommitChanges> commitChanges(List<CommitInfo> commitInfoList, Strin
@Override
public int compare(CommitInfo c1, CommitInfo c2) {
try {
return DATE_FORMAT.parse(c1.getCommitDate()).compareTo(DATE_FORMAT.parse(c2.getCommitDate()));
DateFormat format = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT);
return format.parse(c1.getCommitDate()).compareTo(format.parse(c2.getCommitDate()));
} catch (ParseException e) {
LOG.severe(String.format("Could not parse commit dates %s and %s ", c1.getCommitDate(), c2.getCommitDate()));
return 0;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/jenkins/lastchanges/model/CommitInfo.java
View file
Expand Up @@ -19,7 +19,6 @@ public class CommitInfo implements Serializable {
private String committerName;
private String committerEmail;
private String commitDate;
private DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT);

@Whitelisted
public String getCommitterName() {
Expand Down Expand Up @@ -66,6 +65,7 @@ public String getCommitMessage() {


public String format(Date date, TimeZone tz) {
DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT);
dateFormat.setTimeZone(tz);
return dateFormat.format(date);
}
Expand Down

0 comments on commit 8ea5460

Please sign in to comment.