Skip to content
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

Jump to bottom

[JENKINS-39470] Migrate to 2.17 parent POM #1

Merged
merged 3 commits into from Nov 8, 2016
Merged

[JENKINS-39470] Migrate to 2.17 parent POM #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5cab126
[JENKINS-39470] Migrate to 2.17 parent POM. Apply a couple fixes that…
Nov 3, 2016
ec5d435
[JENKINS-39470] Avoid extra diff.
Nov 7, 2016
ebc2327
[JENKINS-39470] Avoid hiding extra findbug errors.
Nov 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions pom.xml
View file
Open in desktop
Expand Up @@ -3,9 +3,9 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<!-- TODO switch to 1.532.2 if JENKINS-16936 is backported -->
<version>1.537</version>
<version>2.17</version>
</parent>

Copy link

Choose a reason for hiding this comment

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

You should not change the existing code conventions, if there is no space in the original code do not add it

Copy link
Member

Choose a reason for hiding this comment

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

+1 please try to stage only functionnally impacted lines (use git gui or equivalent then select lines, then Index lines.

<artifactId>secure-requester-whitelist</artifactId>
<version>1.1-SNAPSHOT</version>
<packaging>hpi</packaging>
Expand All @@ -18,25 +18,29 @@
<url>http://www.opensource.org/licenses/mit-license.php</url>
</license>
</licenses>

<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>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
</scm>

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

Choose a reason for hiding this comment

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

What is the reason for this deletion??

Copy link
Member

Choose a reason for hiding this comment

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

See comment above, no longer necessary.


<properties>
<!-- TODO until bc4c132 in 1.545, or below 1.536 -->
<concurrency>1</concurrency>
<jenkins.version>1.580.1</jenkins.version>
Copy link
Member

Choose a reason for hiding this comment

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

I suppose it's on purpose you didn't stay on the same 1.537 baseline

<java.level>6</java.level>
</properties>
</project>
2 changes: 2 additions & 0 deletions src/main/java/org/jenkinsci/plugins/secure_requester_whitelist/Whitelist.java
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@

package org.jenkinsci.plugins.secure_requester_whitelist;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.Extension;
import jenkins.model.GlobalConfiguration;
import jenkins.model.GlobalConfigurationCategory;
Expand All @@ -33,6 +34,7 @@

@Extension public class Whitelist extends GlobalConfiguration {

@SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
Copy link
Collaborator

Choose a reason for hiding this comment

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

As Jenkins.getInstance should not be null.

public static Whitelist get() {
return Jenkins.getInstance().getDescriptorByType(Whitelist.class);
}
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/index.jelly
View file
Open in desktop
@@ -1,3 +1,4 @@
<?jelly escape-by-default='true'?>
<div>
Allows an administrator to specify sites trusted to make JSONP or primitive-XPath REST API requests.
</div>
10 changes: 6 additions & 4 deletions src/test/java/org/jenkinsci/plugins/secure_requester_whitelist/SecureRequesterImplTest.java
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
package org.jenkinsci.plugins.secure_requester_whitelist;

import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
import com.gargoylesoftware.htmlunit.WebRequestSettings;
import com.gargoylesoftware.htmlunit.WebRequest;
import java.net.URL;
import net.sf.json.JSONObject;
import static org.junit.Assert.*;
Expand All @@ -51,13 +51,15 @@ public class SecureRequesterImplTest {
assertJSONP("huh?", 403);
}

private void assertJSONP(String referer, int expectedStatusCode) throws Exception {
JenkinsRule.WebClient wc = r.createWebClient();
private void assertJSONP(final String referer, final int expectedStatusCode) throws Exception {
final JenkinsRule.WebClient wc = r.createWebClient();
wc.login("alice");
WebRequestSettings req = new WebRequestSettings(new URL(wc.getContextPath() + "api/json?jsonp"));

final WebRequest req = new WebRequest(new URL(wc.getContextPath() + "api/json?jsonp"));
if (referer != null) {
req.setAdditionalHeader("Referer", referer);
}

try {
wc.getPage(req);
assertEquals(expectedStatusCode, 200);
Expand Down