Skip to content

Add Pipeline support && generic update #2

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
oleg-nenashev merged 19 commits into from
Dec 8, 2017
Merged

Add Pipeline support && generic update #2

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f73a403
Update Maven Parent POM to the latest version
oleg-nenashev Jan 1, 2017
4c8b0ff
Fix Javadoc errors
oleg-nenashev Jan 1, 2017
e6aa1f3
Escape Jelly files by default
oleg-nenashev Jan 1, 2017
0118dbc
Use MasterToSlaveFileCallable in remote operations
oleg-nenashev Jan 1, 2017
c6d7cfd
Fix the broken environment-specific test
oleg-nenashev Jan 1, 2017
d78ebf1
Fix FindBugs warnings
oleg-nenashev Jan 1, 2017
6395d78
Update dependencies for testing with the last Pipeline version
oleg-nenashev Jan 1, 2017
85bbc99
Add MIT Licence declaration to the POM.xml
oleg-nenashev Jan 1, 2017
4bce27e
Rework settings to make the plugin compatible with DataBoundConstructor.
oleg-nenashev Jan 1, 2017
c5290e4
Update plugin SCM API to make it compatible with Pipeline
oleg-nenashev Jan 1, 2017
4693fa0
Update Parent POM to 2.32
oleg-nenashev Jul 4, 2017
b336d13
Add “Delete” button to the repeatableProperty
oleg-nenashev Jul 4, 2017
74fd64c
Address comments from @jglick
oleg-nenashev Jul 17, 2017
b730e12
Make the code buildable, ignore the test for a while
oleg-nenashev Jul 17, 2017
04e987c
Recover the test to run it in CI
oleg-nenashev Jul 17, 2017
a3d50b6
Rename Symbol to filesystem
oleg-nenashev Jul 23, 2017
948d746
Disable the hanging test
oleg-nenashev Jul 23, 2017
76a43c9
Refactor help files
oleg-nenashev Dec 6, 2017
0b98b1a
The configuration does not longer dissapear from Web UI on instances
oleg-nenashev Dec 6, 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
40 changes: 39 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.400</version>
<version>2.32</version>
</parent>

<groupId>hudson.plugins.filesystem_scm</groupId>
Expand All @@ -16,6 +16,10 @@
<description>Using File System as SCM, done by checking file system last modified date.</description>
<url>http://wiki.jenkins-ci.org/display/JENKINS/File+System+SCM</url>

<properties>
<jenkins.version>1.642.3</jenkins.version>
</properties>

<developers>
<developer>
<id>samngms</id>
Expand All @@ -31,6 +35,14 @@
</developer>
</developers>

<licenses>
<license>
<name>MIT License</name>
<url>http://www.opensource.org/licenses/mit-license.php</url>

@jglick jglick Jul 5, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

or just https://opensource.org/licenses/MIT

@oleg-nenashev oleg-nenashev Jul 16, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Does Netbeans already autoresolve it?

@jglick jglick Jul 17, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Yes I think so.

<distribution>repo</distribution>
</license>
</licenses>

<!-- get every artifact through maven.glassfish.org, which proxies all
the artifacts that we need -->
<repositories>
Expand All @@ -46,7 +58,33 @@
<url>http://repo.jenkins-ci.org/public/</url>
</pluginRepository>
</pluginRepositories>

<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-aggregator</artifactId>

@jglick jglick Jul 5, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Do not use this plugin as a dependency even for tests. Specify workflow-cps, workflow-job, and any step plugins you need.

<version>2.4</version>
<scope>test</scope>
</dependency>
<!-- Transient upper bound dependencies -->

@jglick jglick Jul 5, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Transitive?

<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>

@jglick jglick Jul 5, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Make a compile-time dependency and add @Symbols.

<version>1.5</version>
<scope>test</scope>
</dependency>
<dependency> <!-- The core will override it anyway, no? -->
<groupId>org.jenkins-ci</groupId>
<artifactId>annotation-indexer</artifactId>
<version>1.9</version>
<scope>test</scope>
</dependency>
</dependencies>

<scm>
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/hudson/plugins/filesystem_scm/Changelog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.util.Collections;
import java.util.Date;
import java.util.List;
import javax.annotation.CheckForNull;

/** Represents a Changelog record (ChangeLogSet.Entry) in ChangelogSet
*
Expand Down Expand Up @@ -102,12 +103,13 @@ protected void setParent(ChangeLogSet parent) {
this.parent = (ChangelogSet)parent;
}

@CheckForNull
public Date getDate() {
return date;
return date != null ? (Date)date.clone() : null;
}

public void setDate(Date date) {
this.date = date;
this.date = date != null ? (Date)date.clone() : null;
}

@Override
Expand Down
22 changes: 15 additions & 7 deletions src/main/java/hudson/plugins/filesystem_scm/ChangelogSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package hudson.plugins.filesystem_scm;

import hudson.model.*;
import hudson.model.Run;
import hudson.scm.ChangeLogSet;
import hudson.scm.RepositoryBrowser;
import hudson.util.XStream2;
import java.util.*;
import java.io.*;
import org.apache.commons.io.IOUtils;
import org.xml.sax.SAXException;

/**
* FileSystem base SCM ChangelogSet
Expand All @@ -23,9 +26,9 @@ public class ChangelogSet extends hudson.scm.ChangeLogSet<Changelog> {
// not like other SCM, e.g. SVN, there may be 2 or 3 committed changes between builds
private List<Changelog> logs;

public ChangelogSet(AbstractBuild<?, ?> build, List<FolderDiff.Entry> changes) {
super(build);
logs = new ArrayList<Changelog>();
public ChangelogSet(Run<?, ?> build, List<FolderDiff.Entry> changes) {
super(build, new FilesystemRepositoryBrowser());
logs = new ArrayList<>();
if (!changes.isEmpty()) {
logs.add(new Changelog(this, changes));
}
Expand Down Expand Up @@ -93,9 +96,14 @@ private void initXStream() {
//xstream.omitField(ChangelogSet.ChangeLog.class, "parent");
//xstream.omitField(ChangelogSet.Path.class, "changeLog");
}

@SuppressWarnings("rawtypes")
public ChangelogSet parse(AbstractBuild build, java.io.File file) throws FileNotFoundException {

@Override
public ChangeLogSet<? extends Entry> parse(Run build, RepositoryBrowser<?> browser, File changelogFile) throws IOException, SAXException {
return parse(build, changelogFile);
}

@SuppressWarnings("rawtypes")
public ChangelogSet parse(Run<?,?> build, java.io.File file) throws FileNotFoundException {
FileInputStream in = null;
ChangelogSet out = null;
try {
Expand Down
Loading